From nobody Sun Apr 12 00:55:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=dmitry.osipenko@collabora.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=collabora.com); dmarc=pass(p=none dis=none) header.from=collabora.com ARC-Seal: i=2; a=rsa-sha256; t=1772463764; cv=pass; d=zohomail.com; s=zohoarc; b=lyk6lmf4/mipt49DJoa6HaEytiy0BcViRrr9IzWCg45rr0awQgCkfQ6WQUqSs9lgnrKav22jsfdPzs1XUfMlVmNWnFH+49JALDxBLEotqmTEDwb6hVu1yYyo0jQ8rAVsCq5fBjKEC3+u+H4+qmvo7imf5AsrBR4NDNvuocrMvDo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772463764; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AS54lv189IEHKR9A0Q0cYhT+FCK95s4XT6UCUKP5tQY=; b=hbW4xN4Yn1npWNlLyjUUGvsROpB+2W5NXJtY73CwBgWNHjYnOtgssMG5eeIIGlxX0LJluXndSAIOE/fHoT+JtUf1FnmgjQ1yKl4u9seqfq6rExoNP9VD2CQuFYSA2CodpJ4AASzuvY80pyyQ5kbYx/t6cbxqBvqk6iE1QGchtV8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dmitry.osipenko@collabora.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=collabora.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772463764483108.8322433181063; Mon, 2 Mar 2026 07:02:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vx4mj-0005A6-Fs; Mon, 02 Mar 2026 10:02:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx4ln-0004Oc-RG for qemu-devel@nongnu.org; Mon, 02 Mar 2026 10:01:22 -0500 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx4li-00043y-0h for qemu-devel@nongnu.org; Mon, 02 Mar 2026 10:01:13 -0500 Received: by mx.zohomail.com with SMTPS id 1772463633115499.5095331601332; Mon, 2 Mar 2026 07:00:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1772463634; cv=none; d=zohomail.com; s=zohoarc; b=ICLzDkr6J+DOzdYiNH+yi3BrkHfZH1+JEi3ONnocnJRgSovWreXfAXXPkh7MfpIGtoEhiJJ/I3RIPIlpe8D4CddYEF8TOJvEpWy32VZyV8arQtI99NCXyrm24tNoqyuk6FbTyKZ9c1vtQcdDc/TY9YuyKXOkg17iMnZgNBr+3uY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772463634; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=AS54lv189IEHKR9A0Q0cYhT+FCK95s4XT6UCUKP5tQY=; b=YJN0jm5nEMlp7+M4AWMpFrrZfxCnV1dvNv+xGM1FoHZhv5XMwlJF/Ghr9K04AWx1YUuQxJVNstiTH+nl0JxmI54lXgswq3iLAWFG8VkHUCdumQhpA/K+Ws8pWLbfLLvYojRkBb2ATxXQ8x/0FsskHHc2YACIw/mNyCzuUV7CeIQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=dmitry.osipenko@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1772463634; s=zohomail; d=collabora.com; i=dmitry.osipenko@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=AS54lv189IEHKR9A0Q0cYhT+FCK95s4XT6UCUKP5tQY=; b=GKyINWic4SVYInhGcYghmQmm+cwvtOSXInbqwH8MEm1K2L0t+rWLJYa4FAcO9HPv 7h3FQkPwI9Xzg8MtDlMhUDiIT9iQq87tyOtO7XOupj7tb1mM7PafrNoOd+OIjhUYRQe l1jZ3XLlBS/sMGAnT8/nxsit/ObWtwx99RzpXJZk= From: Dmitry Osipenko To: Akihiko Odaki , Huang Rui , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierre-Eric Pelloux-Prayer , "Michael S . Tsirkin" , Paolo Bonzini , Yiwei Zhang , Sergio Lopez Pascual Cc: Gert Wollny , qemu-devel@nongnu.org, Gurchetan Singh , Alyssa Ross , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Alex Deucher , Stefano Stabellini , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xenia Ragiadakou , Honglei Huang , Julia Zhang , Chen Jiqian , Rob Clark , Robert Beckett Subject: [PATCH v21 04/18] ui/gdk: Restore original context after new context creation Date: Mon, 2 Mar 2026 17:59:06 +0300 Message-ID: <20260302145920.735423-5-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260302145920.735423-1-dmitry.osipenko@collabora.com> References: <20260302145920.735423-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=136.143.188.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender4-pp-f112.zoho.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.968, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.495, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity dmitry.osipenko@collabora.com) X-ZM-MESSAGEID: 1772463764842158501 Content-Type: text/plain; charset="utf-8" Get currently bound GL context when creating new GL context and restore it after the creation for consistency with behavior expected by virglrender= er that assumes context-creation doesn't switch context. Signed-off-by: Dmitry Osipenko Reviewed-by: Marc-Andr=C3=A9 Lureau --- ui/gtk-gl-area.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index c709b2ce0f63..ce49000d3f17 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -250,11 +250,13 @@ QEMUGLContext gd_gl_area_create_context(DisplayGLCtx = *dgc, QEMUGLParams *params) { VirtualConsole *vc =3D container_of(dgc, VirtualConsole, gfx.dgc); + GdkGLContext *ctx, *current_ctx; GdkWindow *window; - GdkGLContext *ctx; GError *err =3D NULL; int major, minor; =20 + current_ctx =3D gdk_gl_context_get_current(); + window =3D gtk_widget_get_window(vc->gfx.drawing_area); ctx =3D gdk_window_create_gl_context(window, &err); if (err) { @@ -275,8 +277,12 @@ QEMUGLContext gd_gl_area_create_context(DisplayGLCtx *= dgc, =20 gdk_gl_context_make_current(ctx); gdk_gl_context_get_version(ctx, &major, &minor); - gdk_gl_context_clear_current(); - gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area)); + + if (current_ctx) { + gdk_gl_context_make_current(current_ctx); + } else { + gdk_gl_context_clear_current(); + } =20 if (gd_cmp_gl_context_version(major, minor, params) =3D=3D -1) { /* created ctx version < requested version */ --=20 2.52.0