From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520498277318147.2875363255855; Thu, 8 Mar 2018 00:37:57 -0800 (PST) Received: from localhost ([::1]:37460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr3f-00055J-PD for importer@patchew.org; Thu, 08 Mar 2018 03:37:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyn-0000zk-Di for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqym-0008Lr-LC for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:49 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49356 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqym-0008LN-Gy for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D2E294023113; Thu, 8 Mar 2018 08:32:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87861215CDA7; Thu, 8 Mar 2018 08:32:32 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DB0A217514; Thu, 8 Mar 2018 09:32:31 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:24 +0100 Message-Id: <20180308083231.20180-2-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 1/8] make: switch language file build to be gtk module aware X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Bruce Rogers Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bruce Rogers Now that gtk support builds as a module, CONFIG_GTK changed from y to m. Adjust Makefile correspondingly. Signed-off-by: Bruce Rogers Message-id: 20180307155517.32570-1-brogers@suse.com Signed-off-by: Gerd Hoffmann --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9a75c48ae0..026fa17dc0 100644 --- a/Makefile +++ b/Makefile @@ -851,7 +851,7 @@ ifneq ($(BLOBS),) $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ done endif -ifeq ($(CONFIG_GTK),y) +ifeq ($(CONFIG_GTK),m) $(MAKE) -C po $@ endif $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" --=20 2.9.3 From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520498103175139.3395126366089; Thu, 8 Mar 2018 00:35:03 -0800 (PST) Received: from localhost ([::1]:37443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr0w-0002ce-EC for importer@patchew.org; Thu, 08 Mar 2018 03:35:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyl-0000wS-NM for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqyi-0008Hj-KG for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:47 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49354 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqyi-0008GC-Eh for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:44 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DBC0440252F5 for ; Thu, 8 Mar 2018 08:32:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 860AA7C41; Thu, 8 Mar 2018 08:32:32 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E590A1751E; Thu, 8 Mar 2018 09:32:31 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:25 +0100 Message-Id: <20180308083231.20180-3-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 2/8] sdl: workaround bug in sdl 2.0.8 headers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D892087 Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20180307154258.9313-1-kraxel@redhat.com --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 6f3921c02a..86240f97ac 100755 --- a/configure +++ b/configure @@ -2874,6 +2874,7 @@ if test "$sdl" !=3D "no" ; then int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } EOF sdl_cflags=3D$($sdlconfig --cflags 2>/dev/null) + sdl_cflags=3D"$sdl_cflags -Wno-undef" # workaround 2.0.8 bug if test "$static" =3D "yes" ; then if $pkg_config $sdlname --exists; then sdl_libs=3D$($pkg_config $sdlname --static --libs 2>/dev/null) --=20 2.9.3 From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520498387163688.2085953690781; Thu, 8 Mar 2018 00:39:47 -0800 (PST) Received: from localhost ([::1]:37470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr5V-000771-W1 for importer@patchew.org; Thu, 08 Mar 2018 03:39:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyo-00010t-Cs for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqym-0008Ly-LZ for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:50 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39550 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqym-0008LJ-GH for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E890C406E8BD for ; Thu, 8 Mar 2018 08:32:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83DE02026E03; Thu, 8 Mar 2018 08:32:32 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EFC3E17528; Thu, 8 Mar 2018 09:32:31 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:26 +0100 Message-Id: <20180308083231.20180-4-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 3/8] ui/gtk: make GtkGlArea usage a runtime option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Compile in both gtk-egl and gtk-gl-area, then allow to choose at runtime instead of compile time which opengl variant we want use. Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-2-kraxel@redhat.com --- include/ui/gtk.h | 2 ++ ui/gtk.c | 53 +++++++++++++++++++++++++++++------------------------ ui/Makefile.objs | 3 +-- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 849c896eef..f6dafc5961 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -90,6 +90,8 @@ typedef struct VirtualConsole { }; } VirtualConsole; =20 +extern bool gtk_use_gl_area; + /* ui/gtk.c */ void gd_update_windowsize(VirtualConsole *vc); =20 diff --git a/ui/gtk.c b/ui/gtk.c index 563cff32b8..856429a02f 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -243,6 +243,8 @@ typedef struct VCChardev { #define TYPE_CHARDEV_VC "chardev-vc" #define VC_CHARDEV(obj) OBJECT_CHECK(VCChardev, (obj), TYPE_CHARDEV_VC) =20 +bool gtk_use_gl_area; + static void gd_grab_pointer(VirtualConsole *vc, const char *reason); static void gd_ungrab_pointer(GtkDisplayState *s); static void gd_grab_keyboard(VirtualConsole *vc, const char *reason); @@ -453,7 +455,7 @@ static void gd_update_full_redraw(VirtualConsole *vc) int ww, wh; gdk_drawable_get_size(gtk_widget_get_window(area), &ww, &wh); #if defined(CONFIG_GTK_GL) - if (vc->gfx.gls) { + if (vc->gfx.gls && gtk_use_gl_area) { gtk_gl_area_queue_render(GTK_GL_AREA(vc->gfx.drawing_area)); return; } @@ -725,7 +727,7 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = =3D { .dpy_gl_update =3D gd_gl_area_scanout_flush, }; =20 -#else +#endif /* CONFIG_GTK_GL */ =20 static const DisplayChangeListenerOps dcl_egl_ops =3D { .dpy_name =3D "gtk-egl", @@ -745,7 +747,6 @@ static const DisplayChangeListenerOps dcl_egl_ops =3D { .dpy_gl_update =3D gd_egl_scanout_flush, }; =20 -#endif /* CONFIG_GTK_GL */ #endif /* CONFIG_OPENGL */ =20 /** QEMU Events **/ @@ -844,13 +845,13 @@ static gboolean gd_draw_event(GtkWidget *widget, cair= o_t *cr, void *opaque) =20 #if defined(CONFIG_OPENGL) if (vc->gfx.gls) { -#if defined(CONFIG_GTK_GL) - /* invoke render callback please */ - return FALSE; -#else - gd_egl_draw(vc); - return TRUE; -#endif + if (gtk_use_gl_area) { + /* invoke render callback please */ + return FALSE; + } else { + gd_egl_draw(vc); + return TRUE; + } } #endif =20 @@ -1993,7 +1994,7 @@ static void gd_connect_vc_gfx_signals(VirtualConsole = *vc) g_signal_connect(vc->gfx.drawing_area, "draw", G_CALLBACK(gd_draw_event), vc); #if defined(CONFIG_GTK_GL) - if (display_opengl) { + if (gtk_use_gl_area) { /* wire up GtkGlArea events */ g_signal_connect(vc->gfx.drawing_area, "render", G_CALLBACK(gd_render_event), vc); @@ -2116,26 +2117,29 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, V= irtualConsole *vc, #if defined(CONFIG_OPENGL) if (display_opengl) { #if defined(CONFIG_GTK_GL) - vc->gfx.drawing_area =3D gtk_gl_area_new(); - vc->gfx.dcl.ops =3D &dcl_gl_area_ops; -#else - vc->gfx.drawing_area =3D gtk_drawing_area_new(); - /* - * gtk_widget_set_double_buffered() was deprecated in 3.14. - * It is required for opengl rendering on X11 though. A - * proper replacement (native opengl support) is only - * available in 3.16+. Silence the warning if possible. - */ + if (gtk_use_gl_area) { + vc->gfx.drawing_area =3D gtk_gl_area_new(); + vc->gfx.dcl.ops =3D &dcl_gl_area_ops; + } else +#endif /* CONFIG_GTK_GL */ + { + vc->gfx.drawing_area =3D gtk_drawing_area_new(); + /* + * gtk_widget_set_double_buffered() was deprecated in 3.14. + * It is required for opengl rendering on X11 though. A + * proper replacement (native opengl support) is only + * available in 3.16+. Silence the warning if possible. + */ #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif - gtk_widget_set_double_buffered(vc->gfx.drawing_area, FALSE); + gtk_widget_set_double_buffered(vc->gfx.drawing_area, FALSE); #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE #pragma GCC diagnostic pop #endif - vc->gfx.dcl.ops =3D &dcl_egl_ops; -#endif /* CONFIG_GTK_GL */ + vc->gfx.dcl.ops =3D &dcl_egl_ops; + } } else #endif { @@ -2437,6 +2441,7 @@ static void early_gtk_display_init(DisplayOptions *op= ts) if (opts->has_gl && opts->gl) { #if defined(CONFIG_OPENGL) #if defined(CONFIG_GTK_GL) + gtk_use_gl_area =3D true; gtk_gl_area_init(); #else gtk_egl_init(); diff --git a/ui/Makefile.objs b/ui/Makefile.objs index dcd54a5287..d1203bb80a 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -52,11 +52,10 @@ common-obj-y +=3D egl-context.o common-obj-$(CONFIG_OPENGL_DMABUF) +=3D egl-headless.o ifeq ($(CONFIG_GTK_GL),y) gtk.mo-objs +=3D gtk-gl-area.o -else +endif gtk.mo-objs +=3D gtk-egl.o gtk.mo-libs +=3D $(OPENGL_LIBS) endif -endif =20 shader.o-libs +=3D $(OPENGL_LIBS) console-gl.o-libs +=3D $(OPENGL_LIBS) --=20 2.9.3 From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152049827863056.12559018770082; Thu, 8 Mar 2018 00:37:58 -0800 (PST) Received: from localhost ([::1]:37462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr3h-00055f-8E for importer@patchew.org; Thu, 08 Mar 2018 03:37:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyn-000103-Mt for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqym-0008M5-Lq for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:49 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49392 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqym-0008LK-GS for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC1854040070 for ; Thu, 8 Mar 2018 08:32:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 885E7202698A; Thu, 8 Mar 2018 08:32:32 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 03D1017533; Thu, 8 Mar 2018 09:32:32 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:27 +0100 Message-Id: <20180308083231.20180-5-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 4/8] ui/gtk: group gtk.mo declarations in Makefile X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-3-kraxel@redhat.com --- ui/Makefile.objs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index d1203bb80a..b560ee12c3 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -38,6 +38,13 @@ common-obj-$(CONFIG_GTK) +=3D gtk.mo gtk.mo-objs :=3D gtk.o gtk.mo-cflags :=3D $(GTK_CFLAGS) $(VTE_CFLAGS) gtk.mo-libs :=3D $(GTK_LIBS) $(VTE_LIBS) +ifeq ($(CONFIG_OPENGL),y) +gtk.mo-objs +=3D gtk-egl.o +gtk.mo-libs +=3D $(OPENGL_LIBS) +ifeq ($(CONFIG_GTK_GL),y) +gtk.mo-objs +=3D gtk-gl-area.o +endif +endif =20 common-obj-$(CONFIG_CURSES) +=3D curses.mo curses.mo-objs :=3D curses.o @@ -50,11 +57,6 @@ common-obj-y +=3D console-gl.o common-obj-y +=3D egl-helpers.o common-obj-y +=3D egl-context.o common-obj-$(CONFIG_OPENGL_DMABUF) +=3D egl-headless.o -ifeq ($(CONFIG_GTK_GL),y) -gtk.mo-objs +=3D gtk-gl-area.o -endif -gtk.mo-objs +=3D gtk-egl.o -gtk.mo-libs +=3D $(OPENGL_LIBS) endif =20 shader.o-libs +=3D $(OPENGL_LIBS) --=20 2.9.3 From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520498277317953.4102803612799; Thu, 8 Mar 2018 00:37:57 -0800 (PST) Received: from localhost ([::1]:37461 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr3h-00055d-At for importer@patchew.org; Thu, 08 Mar 2018 03:37:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqys-00015d-LO for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqym-0008Mb-TH for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:54 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49358 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqym-0008Ld-PV for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 51547416974A for ; Thu, 8 Mar 2018 08:32:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D251215CDAA; Thu, 8 Mar 2018 08:32:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0C01CA1EB; Thu, 8 Mar 2018 09:32:32 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:28 +0100 Message-Id: <20180308083231.20180-6-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 5/8] ui/opengl: Makefile cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" With gtk.mo bits moved away we don't need the ifeq any more. Also add missing opengl libs for some objects. Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-4-kraxel@redhat.com --- ui/Makefile.objs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index b560ee12c3..cc784346cb 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -51,14 +51,14 @@ curses.mo-objs :=3D curses.o curses.mo-cflags :=3D $(CURSES_CFLAGS) curses.mo-libs :=3D $(CURSES_LIBS) =20 -ifeq ($(CONFIG_OPENGL),y) -common-obj-y +=3D shader.o -common-obj-y +=3D console-gl.o -common-obj-y +=3D egl-helpers.o -common-obj-y +=3D egl-context.o +common-obj-$(CONFIG_OPENGL) +=3D shader.o +common-obj-$(CONFIG_OPENGL) +=3D console-gl.o +common-obj-$(CONFIG_OPENGL) +=3D egl-helpers.o +common-obj-$(CONFIG_OPENGL) +=3D egl-context.o common-obj-$(CONFIG_OPENGL_DMABUF) +=3D egl-headless.o -endif =20 shader.o-libs +=3D $(OPENGL_LIBS) console-gl.o-libs +=3D $(OPENGL_LIBS) egl-helpers.o-libs +=3D $(OPENGL_LIBS) +egl-context.o-libs +=3D $(OPENGL_LIBS) +egl-headless.o-libs +=3D $(OPENGL_LIBS) --=20 2.9.3 From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520498104596338.66932959955386; Thu, 8 Mar 2018 00:35:04 -0800 (PST) Received: from localhost ([::1]:37445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr0x-0002dD-OX for importer@patchew.org; Thu, 08 Mar 2018 03:35:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyn-0000zl-Jg for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqym-0008MS-ST for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:49 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48874 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqym-0008Lf-OS for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5908FD142B for ; Thu, 8 Mar 2018 08:32:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D1B72022BC6; Thu, 8 Mar 2018 08:32:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 141DCA1F0; Thu, 8 Mar 2018 09:32:32 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:29 +0100 Message-Id: <20180308083231.20180-7-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 08 Mar 2018 08:32:38 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 6/8] ui/gtk: use GtkGlArea on wayland only X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For dma-buf support we need a egl context. The gtk x11 backend uses glx contexts though. We can't use the GtkGlArea widget on x11 because of that, so use our own gtk-egl code instead. wayland continues to use the GtkGlArea widget. Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-5-kraxel@redhat.com --- ui/gtk.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 856429a02f..4a1622b887 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2440,12 +2440,15 @@ static void early_gtk_display_init(DisplayOptions *= opts) assert(opts->type =3D=3D DISPLAY_TYPE_GTK); if (opts->has_gl && opts->gl) { #if defined(CONFIG_OPENGL) -#if defined(CONFIG_GTK_GL) - gtk_use_gl_area =3D true; - gtk_gl_area_init(); -#else - gtk_egl_init(); +#if defined(CONFIG_GTK_GL) && defined(GDK_WINDOWING_WAYLAND) + if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) { + gtk_use_gl_area =3D true; + gtk_gl_area_init(); + } #endif + { + gtk_egl_init(); + } #endif } =20 --=20 2.9.3 From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520498278727477.3133315718792; Thu, 8 Mar 2018 00:37:58 -0800 (PST) Received: from localhost ([::1]:37459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr3e-00052w-AD for importer@patchew.org; Thu, 08 Mar 2018 03:37:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyl-0000wQ-NM for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqyi-0008HQ-JU for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:47 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50498 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqyi-0008GB-E8 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:44 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0C338163C52 for ; Thu, 8 Mar 2018 08:32:39 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 678667C41; Thu, 8 Mar 2018 08:32:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1E5D0A1FC; Thu, 8 Mar 2018 09:32:32 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:30 +0100 Message-Id: <20180308083231.20180-8-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 08 Mar 2018 08:32:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 08 Mar 2018 08:32:39 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 7/8] ui/gtk-egl: add scanout_dmabuf support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for dmabuf scanouts to gtk-egl. Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-6-kraxel@redhat.com --- include/ui/gtk.h | 4 ++++ ui/gtk-egl.c | 23 +++++++++++++++++++++++ ui/gtk.c | 2 ++ 3 files changed, 29 insertions(+) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index f6dafc5961..84c992c227 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -113,6 +113,10 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl, uint32_t backing_height, uint32_t x, uint32_t y, uint32_t w, uint32_t h); +void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf); +void gd_egl_release_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf); void gd_egl_scanout_flush(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint32_t h); void gtk_egl_init(void); diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index eb86c26a1d..2c83c22d04 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -194,6 +194,29 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl, backing_id, false); } =20 +void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf) +{ +#ifdef CONFIG_OPENGL_DMABUF + egl_dmabuf_import_texture(dmabuf); + if (!dmabuf->texture) { + return; + } + + gd_egl_scanout_texture(dcl, dmabuf->texture, + false, dmabuf->width, dmabuf->height, + 0, 0, dmabuf->width, dmabuf->height); +#endif +} + +void gd_egl_release_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf) +{ +#ifdef CONFIG_OPENGL_DMABUF + egl_dmabuf_release_texture(dmabuf); +#endif +} + void gd_egl_scanout_flush(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint32_t h) { diff --git a/ui/gtk.c b/ui/gtk.c index 4a1622b887..cf2061d716 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -744,6 +744,8 @@ static const DisplayChangeListenerOps dcl_egl_ops =3D { .dpy_gl_ctx_get_current =3D qemu_egl_get_current_context, .dpy_gl_scanout_disable =3D gd_egl_scanout_disable, .dpy_gl_scanout_texture =3D gd_egl_scanout_texture, + .dpy_gl_scanout_dmabuf =3D gd_egl_scanout_dmabuf, + .dpy_gl_release_dmabuf =3D gd_egl_release_dmabuf, .dpy_gl_update =3D gd_egl_scanout_flush, }; =20 --=20 2.9.3 From nobody Wed May 1 06:45:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520498103023379.9066253817806; Thu, 8 Mar 2018 00:35:03 -0800 (PST) Received: from localhost ([::1]:37444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etr0w-0002cl-4x for importer@patchew.org; Thu, 08 Mar 2018 03:35:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etqyl-0000wT-NZ for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etqyi-0008HW-JR for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:47 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39548 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etqyi-0008GA-Ep for qemu-devel@nongnu.org; Thu, 08 Mar 2018 03:32:44 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9193406E8C3 for ; Thu, 8 Mar 2018 08:32:39 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68C2E2026609; Thu, 8 Mar 2018 08:32:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 28B16EB3; Thu, 8 Mar 2018 09:32:32 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 09:32:31 +0100 Message-Id: <20180308083231.20180-9-kraxel@redhat.com> In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com> References: <20180308083231.20180-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Mar 2018 08:32:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Mar 2018 08:32:39 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 8/8] ui/gtk-egl: add cursor_dmabuf support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for cursor dmabufs to gtk-egl. Just blend in the cursor (if we have one) when rendering the dmabuf. Signed-off-by: Gerd Hoffmann Message-id: 20180306090951.22932-7-kraxel@redhat.com --- include/ui/gtk.h | 8 ++++++++ ui/gtk-egl.c | 40 +++++++++++++++++++++++++++++++++++++++- ui/gtk.c | 2 ++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 84c992c227..2922fc64b2 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -54,6 +54,9 @@ typedef struct VirtualGfxConsole { int x, y, w, h; egl_fb guest_fb; egl_fb win_fb; + egl_fb cursor_fb; + int cursor_x; + int cursor_y; bool y0_top; bool scanout_mode; #endif @@ -115,6 +118,11 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl, uint32_t w, uint32_t h); void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf); +void gd_egl_cursor_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf, bool have_hot, + uint32_t hot_x, uint32_t hot_y); +void gd_egl_cursor_position(DisplayChangeListener *dcl, + uint32_t pos_x, uint32_t pos_y); void gd_egl_release_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf); void gd_egl_scanout_flush(DisplayChangeListener *dcl, diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index 2c83c22d04..9390c6762e 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -19,6 +19,7 @@ #include "ui/console.h" #include "ui/gtk.h" #include "ui/egl-helpers.h" +#include "ui/shader.h" =20 #include "sysemu/sysemu.h" =20 @@ -209,6 +210,35 @@ void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl, #endif } =20 +void gd_egl_cursor_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf, bool have_hot, + uint32_t hot_x, uint32_t hot_y) +{ +#ifdef CONFIG_OPENGL_DMABUF + VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); + + if (dmabuf) { + egl_dmabuf_import_texture(dmabuf); + if (!dmabuf->texture) { + return; + } + egl_fb_setup_for_tex(&vc->gfx.cursor_fb, dmabuf->width, dmabuf->he= ight, + dmabuf->texture, false); + } else { + egl_fb_destroy(&vc->gfx.cursor_fb); + } +#endif +} + +void gd_egl_cursor_position(DisplayChangeListener *dcl, + uint32_t pos_x, uint32_t pos_y) +{ + VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); + + vc->gfx.cursor_x =3D pos_x; + vc->gfx.cursor_y =3D pos_y; +} + void gd_egl_release_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf) { @@ -237,7 +267,15 @@ void gd_egl_scanout_flush(DisplayChangeListener *dcl, window =3D gtk_widget_get_window(vc->gfx.drawing_area); gdk_drawable_get_size(window, &ww, &wh); egl_fb_setup_default(&vc->gfx.win_fb, ww, wh); - egl_fb_blit(&vc->gfx.win_fb, &vc->gfx.guest_fb, !vc->gfx.y0_top); + if (vc->gfx.cursor_fb.texture) { + egl_texture_blit(vc->gfx.gls, &vc->gfx.win_fb, &vc->gfx.guest_fb, + vc->gfx.y0_top); + egl_texture_blend(vc->gfx.gls, &vc->gfx.win_fb, &vc->gfx.cursor_fb, + vc->gfx.y0_top, + vc->gfx.cursor_x, vc->gfx.cursor_y); + } else { + egl_fb_blit(&vc->gfx.win_fb, &vc->gfx.guest_fb, !vc->gfx.y0_top); + } =20 eglSwapBuffers(qemu_egl_display, vc->gfx.esurface); } diff --git a/ui/gtk.c b/ui/gtk.c index cf2061d716..ef5bc42094 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -745,6 +745,8 @@ static const DisplayChangeListenerOps dcl_egl_ops =3D { .dpy_gl_scanout_disable =3D gd_egl_scanout_disable, .dpy_gl_scanout_texture =3D gd_egl_scanout_texture, .dpy_gl_scanout_dmabuf =3D gd_egl_scanout_dmabuf, + .dpy_gl_cursor_dmabuf =3D gd_egl_cursor_dmabuf, + .dpy_gl_cursor_position =3D gd_egl_cursor_position, .dpy_gl_release_dmabuf =3D gd_egl_release_dmabuf, .dpy_gl_update =3D gd_egl_scanout_flush, }; --=20 2.9.3