From nobody Wed Nov 5 15:40:35 2025 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496747228794656.2643723136104; Tue, 6 Jun 2017 04:07:08 -0700 (PDT) Received: from localhost ([::1]:37535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICKF-00065g-V2 for importer@patchew.org; Tue, 06 Jun 2017 07:07:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICIV-00050q-2j for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dICIT-0002in-1X for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34432) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dICIS-0002iV-Pr for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD4F661B91 for ; Tue, 6 Jun 2017 11:05:11 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0B3217D64; Tue, 6 Jun 2017 11:05:03 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id DFE8780E99; Tue, 6 Jun 2017 13:05:01 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DD4F661B91 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DD4F661B91 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 13:04:56 +0200 Message-Id: <20170606110459.9771-2-kraxel@redhat.com> In-Reply-To: <20170606110459.9771-1-kraxel@redhat.com> References: <20170606110459.9771-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 06 Jun 2017 11:05:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] egl-helpers: add helpers to handle opengl framebuffers 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 a collection of egl_fb_*() helper functions to manage and use opengl framebuffers, which is a common pattern in UI code with opengl support. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/ui/egl-helpers.h | 14 ++++++++++ ui/egl-helpers.c | 69 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 83 insertions(+) diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index c785d60e91..01aa45fb32 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -8,6 +8,20 @@ extern EGLDisplay *qemu_egl_display; extern EGLConfig qemu_egl_config; =20 +typedef struct egl_fb { + int width; + int height; + GLuint texture; + GLuint framebuffer; + bool delete_texture; +} egl_fb; + +void egl_fb_destroy(egl_fb *fb); +void egl_fb_create_for_tex(egl_fb *fb, int width, int height, GLuint textu= re); +void egl_fb_create_new_tex(egl_fb *fb, int width, int height); +void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip); +void egl_fb_read(void *dst, egl_fb *src); + #ifdef CONFIG_OPENGL_DMABUF =20 extern int qemu_egl_rn_fd; diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index 4a4d3370ee..b14250ae62 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -24,6 +24,75 @@ EGLDisplay *qemu_egl_display; EGLConfig qemu_egl_config; =20 +/* ------------------------------------------------------------------ */ + +void egl_fb_destroy(egl_fb *fb) +{ + if (!fb->framebuffer) { + return; + } + + if (fb->delete_texture) { + glDeleteTextures(1, &fb->texture); + fb->delete_texture =3D false; + } + glDeleteFramebuffers(1, &fb->framebuffer); + + fb->width =3D 0; + fb->height =3D 0; + fb->texture =3D 0; + fb->framebuffer =3D 0; +} + +void egl_fb_create_for_tex(egl_fb *fb, int width, int height, GLuint textu= re) +{ + fb->width =3D width; + fb->height =3D height; + fb->texture =3D texture; + if (!fb->framebuffer) { + glGenFramebuffers(1, &fb->framebuffer); + } + + glBindFramebuffer(GL_FRAMEBUFFER_EXT, fb->framebuffer); + glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, + GL_TEXTURE_2D, fb->texture, 0); +} + +void egl_fb_create_new_tex(egl_fb *fb, int width, int height) +{ + GLuint texture; + + glGenTextures(1, &texture); + glBindTexture(GL_TEXTURE_2D, texture); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, + 0, GL_BGRA, GL_UNSIGNED_BYTE, 0); + + egl_fb_create_for_tex(fb, width, height, texture); + fb->delete_texture =3D true; +} + +void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip) +{ + GLuint y1, y2; + + glBindFramebuffer(GL_READ_FRAMEBUFFER, src->framebuffer); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dst->framebuffer); + glViewport(0, 0, dst->width, dst->height); + y1 =3D flip ? src->height : 0; + y2 =3D flip ? 0 : src->height; + glBlitFramebuffer(0, y1, src->width, y2, + 0, 0, dst->width, dst->height, + GL_COLOR_BUFFER_BIT, GL_NEAREST); +} + +void egl_fb_read(void *dst, egl_fb *src) +{ + glBindFramebuffer(GL_READ_FRAMEBUFFER, src->framebuffer); + glReadBuffer(GL_COLOR_ATTACHMENT0_EXT); + glReadPixels(0, 0, src->width, src->height, + GL_BGRA, GL_UNSIGNED_BYTE, dst); +} + /* ---------------------------------------------------------------------- = */ =20 #ifdef CONFIG_OPENGL_DMABUF --=20 2.9.3 From nobody Wed Nov 5 15:40:35 2025 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496747211377751.984471123612; Tue, 6 Jun 2017 04:06:51 -0700 (PDT) Received: from localhost ([::1]:37534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICJw-0005pK-CS for importer@patchew.org; Tue, 06 Jun 2017 07:06:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICIQ-0004x6-Ho for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dICIP-0002gr-6v for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45082) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dICIO-0002fR-Uc for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 04A55A990 for ; Tue, 6 Jun 2017 11:05:08 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BE9D7D4F5; Tue, 6 Jun 2017 11:05:05 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 010CC80F3B; Tue, 6 Jun 2017 13:05:01 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 04A55A990 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 04A55A990 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 13:04:57 +0200 Message-Id: <20170606110459.9771-3-kraxel@redhat.com> In-Reply-To: <20170606110459.9771-1-kraxel@redhat.com> References: <20170606110459.9771-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 06 Jun 2017 11:05:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] egl-headless: use framebuffer helper functions. 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 --- ui/egl-headless.c | 67 ++++++++++++++-------------------------------------= ---- 1 file changed, 17 insertions(+), 50 deletions(-) diff --git a/ui/egl-headless.c b/ui/egl-headless.c index d8d800f8a6..809bfde99c 100644 --- a/ui/egl-headless.c +++ b/ui/egl-headless.c @@ -8,14 +8,13 @@ typedef struct egl_dpy { DisplayChangeListener dcl; DisplaySurface *ds; - int width, height; - GLuint texture; - GLuint framebuffer; - GLuint blit_texture; - GLuint blit_framebuffer; + egl_fb guest_fb; + egl_fb blit_fb; bool y_0_top; } egl_dpy; =20 +/* ------------------------------------------------------------------ */ + static void egl_refresh(DisplayChangeListener *dcl) { graphic_hw_update(dcl->con); @@ -38,8 +37,8 @@ static void egl_scanout_disable(DisplayChangeListener *dc= l) { egl_dpy *edpy =3D container_of(dcl, egl_dpy, dcl); =20 - edpy->texture =3D 0; - /* XXX: delete framebuffers here ??? */ + egl_fb_destroy(&edpy->guest_fb); + egl_fb_destroy(&edpy->blit_fb); } =20 static void egl_scanout_texture(DisplayChangeListener *dcl, @@ -52,34 +51,17 @@ static void egl_scanout_texture(DisplayChangeListener *= dcl, { egl_dpy *edpy =3D container_of(dcl, egl_dpy, dcl); =20 - edpy->texture =3D backing_id; edpy->y_0_top =3D backing_y_0_top; =20 /* source framebuffer */ - if (!edpy->framebuffer) { - glGenFramebuffers(1, &edpy->framebuffer); - } - glBindFramebuffer(GL_FRAMEBUFFER_EXT, edpy->framebuffer); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, edpy->texture, 0); + egl_fb_create_for_tex(&edpy->guest_fb, + backing_width, backing_height, backing_id); =20 /* dest framebuffer */ - if (!edpy->blit_framebuffer) { - glGenFramebuffers(1, &edpy->blit_framebuffer); - glGenTextures(1, &edpy->blit_texture); - edpy->width =3D 0; - edpy->height =3D 0; - } - if (edpy->width !=3D backing_width || edpy->height !=3D backing_height= ) { - edpy->width =3D backing_width; - edpy->height =3D backing_height; - glBindTexture(GL_TEXTURE_2D, edpy->blit_texture); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, - edpy->width, edpy->height, - 0, GL_BGRA, GL_UNSIGNED_BYTE, 0); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, edpy->blit_framebuffer); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0= _EXT, - GL_TEXTURE_2D, edpy->blit_texture, 0); + if (edpy->blit_fb.width !=3D backing_width || + edpy->blit_fb.height !=3D backing_height) { + egl_fb_destroy(&edpy->blit_fb); + egl_fb_create_new_tex(&edpy->blit_fb, backing_width, backing_heigh= t); } } =20 @@ -88,32 +70,17 @@ static void egl_scanout_flush(DisplayChangeListener *dc= l, uint32_t w, uint32_t h) { egl_dpy *edpy =3D container_of(dcl, egl_dpy, dcl); - GLuint y1, y2; =20 - if (!edpy->texture || !edpy->ds) { + if (!edpy->guest_fb.texture || !edpy->ds) { return; } - assert(surface_width(edpy->ds) =3D=3D edpy->width); - assert(surface_height(edpy->ds) =3D=3D edpy->height); + assert(surface_width(edpy->ds) =3D=3D edpy->guest_fb.width); + assert(surface_height(edpy->ds) =3D=3D edpy->guest_fb.height); assert(surface_format(edpy->ds) =3D=3D PIXMAN_x8r8g8b8); =20 - /* blit framebuffer, flip if needed */ - glBindFramebuffer(GL_READ_FRAMEBUFFER, edpy->framebuffer); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, edpy->blit_framebuffer); - glViewport(0, 0, edpy->width, edpy->height); - y1 =3D edpy->y_0_top ? edpy->height : 0; - y2 =3D edpy->y_0_top ? 0 : edpy->height; - glBlitFramebuffer(0, y1, edpy->width, y2, - 0, 0, edpy->width, edpy->height, - GL_COLOR_BUFFER_BIT, GL_NEAREST); + egl_fb_blit(&edpy->blit_fb, &edpy->guest_fb, edpy->y_0_top); + egl_fb_read(surface_data(edpy->ds), &edpy->blit_fb); =20 - /* read pixels to surface */ - glBindFramebuffer(GL_READ_FRAMEBUFFER, edpy->blit_framebuffer); - glReadBuffer(GL_COLOR_ATTACHMENT0_EXT); - glReadPixels(0, 0, edpy->width, edpy->height, - GL_BGRA, GL_UNSIGNED_BYTE, surface_data(edpy->ds)); - - /* notify about updates */ dpy_gfx_update(edpy->dcl.con, x, y, w, h); } =20 --=20 2.9.3 From nobody Wed Nov 5 15:40:35 2025 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496747227657996.6628083493974; Tue, 6 Jun 2017 04:07:07 -0700 (PDT) Received: from localhost ([::1]:37536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICKG-00066Y-1L for importer@patchew.org; Tue, 06 Jun 2017 07:07:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICIV-00050n-2K for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dICIT-0002iw-Bt for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dICIT-0002ie-42 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 318EABDD4 for ; Tue, 6 Jun 2017 11:05:12 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF05F17D63; Tue, 6 Jun 2017 11:05:03 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 146AB80FFC; Tue, 6 Jun 2017 13:05:02 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 318EABDD4 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 318EABDD4 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 13:04:58 +0200 Message-Id: <20170606110459.9771-4-kraxel@redhat.com> In-Reply-To: <20170606110459.9771-1-kraxel@redhat.com> References: <20170606110459.9771-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 06 Jun 2017 11:05:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] sdl2: use framebuffer helper functions. 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 --- include/ui/sdl2.h | 8 ++++++-- ui/sdl2-gl.c | 38 ++++++++------------------------------ 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index aaf226c2c0..454367ac84 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -7,6 +7,10 @@ #include #include =20 +#ifdef CONFIG_OPENGL +# include "ui/egl-helpers.h" +#endif + struct sdl2_console { DisplayChangeListener dcl; DisplaySurface *surface; @@ -23,8 +27,8 @@ struct sdl2_console { SDL_GLContext winctx; #ifdef CONFIG_OPENGL ConsoleGLState *gls; - GLuint tex_id; - GLuint fbo_id; + egl_fb guest_fb; + egl_fb win_fb; bool y0_top; bool scanout_mode; #endif diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index 1cd77e2c16..6640d0a9c8 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -42,14 +42,7 @@ static void sdl2_set_scanout_mode(struct sdl2_console *s= con, bool scanout) =20 scon->scanout_mode =3D scanout; if (!scon->scanout_mode) { - if (scon->fbo_id) { - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, 0, 0); - glDeleteFramebuffers(1, &scon->fbo_id); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); - scon->fbo_id =3D 0; - } + egl_fb_destroy(&scon->guest_fb); if (scon->surface) { surface_gl_destroy_texture(scon->gls, scon->surface); surface_gl_create_texture(scon->gls, scon->surface); @@ -191,7 +184,6 @@ void sdl2_gl_scanout_disable(DisplayChangeListener *dcl) assert(scon->opengl); scon->w =3D 0; scon->h =3D 0; - scon->tex_id =3D 0; sdl2_set_scanout_mode(scon, false); } =20 @@ -210,48 +202,34 @@ void sdl2_gl_scanout_texture(DisplayChangeListener *d= cl, scon->y =3D y; scon->w =3D w; scon->h =3D h; - scon->tex_id =3D backing_id; scon->y0_top =3D backing_y_0_top; =20 SDL_GL_MakeCurrent(scon->real_window, scon->winctx); =20 sdl2_set_scanout_mode(scon, true); - if (!scon->fbo_id) { - glGenFramebuffers(1, &scon->fbo_id); - } - - glBindFramebuffer(GL_FRAMEBUFFER_EXT, scon->fbo_id); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, scon->tex_id, 0); + egl_fb_create_for_tex(&scon->guest_fb, backing_width, backing_height, + backing_id); } =20 void sdl2_gl_scanout_flush(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint32_t h) { struct sdl2_console *scon =3D container_of(dcl, struct sdl2_console, d= cl); - int ww, wh, y1, y2; =20 assert(scon->opengl); if (!scon->scanout_mode) { return; } - if (!scon->fbo_id) { + if (!scon->guest_fb.framebuffer) { return; } =20 SDL_GL_MakeCurrent(scon->real_window, scon->winctx); =20 - glBindFramebuffer(GL_READ_FRAMEBUFFER, scon->fbo_id); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); - - SDL_GetWindowSize(scon->real_window, &ww, &wh); - glViewport(0, 0, ww, wh); - y1 =3D scon->y0_top ? 0 : scon->h; - y2 =3D scon->y0_top ? scon->h : 0; - glBlitFramebuffer(0, y1, scon->w, y2, - 0, 0, ww, wh, - GL_COLOR_BUFFER_BIT, GL_NEAREST); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, scon->fbo_id); + SDL_GetWindowSize(scon->real_window, + &scon->win_fb.width, + &scon->win_fb.height); + egl_fb_blit(&scon->win_fb, &scon->guest_fb, !scon->y0_top); =20 SDL_GL_SwapWindow(scon->real_window); } --=20 2.9.3 From nobody Wed Nov 5 15:40:35 2025 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496747466995272.86126671343754; Tue, 6 Jun 2017 04:11:06 -0700 (PDT) Received: from localhost ([::1]:37552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICO5-0001QS-D0 for importer@patchew.org; Tue, 06 Jun 2017 07:11:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICIX-00052U-W8 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dICIR-0002iL-TG for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dICIR-0002hu-KY for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:05:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D53530AF4D for ; Tue, 6 Jun 2017 11:05:10 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 339D017C40; Tue, 6 Jun 2017 11:05:05 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 2C08A8100C; Tue, 6 Jun 2017 13:05:02 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9D53530AF4D Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9D53530AF4D From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 13:04:59 +0200 Message-Id: <20170606110459.9771-5-kraxel@redhat.com> In-Reply-To: <20170606110459.9771-1-kraxel@redhat.com> References: <20170606110459.9771-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 06 Jun 2017 11:05:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] gtk: use framebuffer helper functions. 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 --- include/ui/gtk.h | 4 ++-- ui/gtk-egl.c | 38 ++++++++------------------------------ ui/gtk-gl-area.c | 26 +++++++------------------- 3 files changed, 17 insertions(+), 51 deletions(-) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index ca9a2268de..2f7b720358 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -52,8 +52,8 @@ typedef struct VirtualGfxConsole { EGLSurface esurface; int glupdates; int x, y, w, h; - GLuint tex_id; - GLuint fbo_id; + egl_fb guest_fb; + egl_fb win_fb; bool y0_top; bool scanout_mode; #endif diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index cf48cca259..c40f028b4b 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -30,14 +30,7 @@ static void gtk_egl_set_scanout_mode(VirtualConsole *vc,= bool scanout) =20 vc->gfx.scanout_mode =3D scanout; if (!vc->gfx.scanout_mode) { - if (vc->gfx.fbo_id) { - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, 0, 0); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); - glDeleteFramebuffers(1, &vc->gfx.fbo_id); - vc->gfx.fbo_id =3D 0; - } + egl_fb_destroy(&vc->gfx.guest_fb); if (vc->gfx.surface) { surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); @@ -176,7 +169,6 @@ void gd_egl_scanout_disable(DisplayChangeListener *dcl) =20 vc->gfx.w =3D 0; vc->gfx.h =3D 0; - vc->gfx.tex_id =3D 0; gtk_egl_set_scanout_mode(vc, false); } =20 @@ -192,20 +184,14 @@ void gd_egl_scanout_texture(DisplayChangeListener *dc= l, vc->gfx.y =3D y; vc->gfx.w =3D w; vc->gfx.h =3D h; - vc->gfx.tex_id =3D backing_id; vc->gfx.y0_top =3D backing_y_0_top; =20 eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, vc->gfx.esurface, vc->gfx.ectx); =20 gtk_egl_set_scanout_mode(vc, true); - if (!vc->gfx.fbo_id) { - glGenFramebuffers(1, &vc->gfx.fbo_id); - } - - glBindFramebuffer(GL_FRAMEBUFFER_EXT, vc->gfx.fbo_id); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, vc->gfx.tex_id, 0); + egl_fb_create_for_tex(&vc->gfx.guest_fb, backing_width, backing_height, + backing_id); } =20 void gd_egl_scanout_flush(DisplayChangeListener *dcl, @@ -213,30 +199,22 @@ void gd_egl_scanout_flush(DisplayChangeListener *dcl, { VirtualConsole *vc =3D container_of(dcl, VirtualConsole, gfx.dcl); GdkWindow *window; - int ww, wh, y1, y2; =20 if (!vc->gfx.scanout_mode) { return; } - if (!vc->gfx.fbo_id) { + if (!vc->gfx.guest_fb.framebuffer) { return; } =20 eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, vc->gfx.esurface, vc->gfx.ectx); =20 - glBindFramebuffer(GL_READ_FRAMEBUFFER, vc->gfx.fbo_id); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); - window =3D gtk_widget_get_window(vc->gfx.drawing_area); - gdk_drawable_get_size(window, &ww, &wh); - glViewport(0, 0, ww, wh); - y1 =3D vc->gfx.y0_top ? 0 : vc->gfx.h; - y2 =3D vc->gfx.y0_top ? vc->gfx.h : 0; - glBlitFramebuffer(0, y1, vc->gfx.w, y2, - 0, 0, ww, wh, - GL_COLOR_BUFFER_BIT, GL_NEAREST); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, vc->gfx.fbo_id); + gdk_drawable_get_size(window, + &vc->gfx.win_fb.width, + &vc->gfx.win_fb.height); + 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-gl-area.c b/ui/gtk-gl-area.c index b05c665cbb..18b298fc21 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -26,14 +26,7 @@ static void gtk_gl_area_set_scanout_mode(VirtualConsole = *vc, bool scanout) =20 vc->gfx.scanout_mode =3D scanout; if (!vc->gfx.scanout_mode) { - if (vc->gfx.fbo_id) { - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, 0, 0); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); - glDeleteFramebuffers(1, &vc->gfx.fbo_id); - vc->gfx.fbo_id =3D 0; - } + egl_fb_destroy(&vc->gfx.guest_fb); if (vc->gfx.surface) { surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); @@ -56,11 +49,11 @@ void gd_gl_area_draw(VirtualConsole *vc) wh =3D gtk_widget_get_allocated_height(vc->gfx.drawing_area); =20 if (vc->gfx.scanout_mode) { - if (!vc->gfx.fbo_id) { + if (!vc->gfx.guest_fb.framebuffer) { return; } =20 - glBindFramebuffer(GL_READ_FRAMEBUFFER, vc->gfx.fbo_id); + glBindFramebuffer(GL_READ_FRAMEBUFFER, vc->gfx.guest_fb.framebuffe= r); /* GtkGLArea sets GL_DRAW_FRAMEBUFFER for us */ =20 glViewport(0, 0, ww, wh); @@ -181,24 +174,19 @@ void gd_gl_area_scanout_texture(DisplayChangeListener= *dcl, vc->gfx.y =3D y; vc->gfx.w =3D w; vc->gfx.h =3D h; - vc->gfx.tex_id =3D backing_id; vc->gfx.y0_top =3D backing_y_0_top; =20 gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area)); =20 - if (vc->gfx.tex_id =3D=3D 0 || vc->gfx.w =3D=3D 0 || vc->gfx.h =3D=3D = 0) { + if (vc->gfx.guest_fb.framebuffer =3D=3D 0 || + vc->gfx.w =3D=3D 0 || vc->gfx.h =3D=3D 0) { gtk_gl_area_set_scanout_mode(vc, false); return; } =20 gtk_gl_area_set_scanout_mode(vc, true); - if (!vc->gfx.fbo_id) { - glGenFramebuffers(1, &vc->gfx.fbo_id); - } - - glBindFramebuffer(GL_FRAMEBUFFER_EXT, vc->gfx.fbo_id); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, vc->gfx.tex_id, 0); + egl_fb_create_for_tex(&vc->gfx.guest_fb, backing_width, backing_height, + backing_id); } =20 void gd_gl_area_scanout_flush(DisplayChangeListener *dcl, --=20 2.9.3