From nobody Sun May 5 19:23:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568014840; cv=none; d=zoho.com; s=zohoarc; b=Xy1YKj06bRx40EwxhkfH3SOzgXtxTeozFg3uXtDEOE3XLwG8NvMBUjjuiIiXHuwDqpViDckvcP9paYDTwXWRw+eHRaJoaiG1kZrtfQxAJ6M2Prf5HJaWGdz8OJIb2lg721Xsg5IjJ4LQnuhJjSznaRpV7kDW0mxX0GbHPfbZRQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568014840; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=fO961nMxr6Tam45ZLq8vPWFmyP5Qj9/DgPRBg5/s+8U=; b=Mp5CAeAJHmlRS6HmwonzsX9EgYc0qL9yOv5d39bZsyt9KEMw8hPRbpH+6dgimd/V78TzG4yA16i+n6ERcIs6pO55W+45nraXZ/pby55CNHZtFF2RF/lPSuZYsSpO0jmVL2rYlZ9lonSci7p/AUA6FqNrJOZCc+n6/N54XwF6jJs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568014840950438.1530269425467; Mon, 9 Sep 2019 00:40:40 -0700 (PDT) Received: from localhost ([::1]:52640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7EHv-000646-Ax for importer@patchew.org; Mon, 09 Sep 2019 03:40:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44063) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7EGe-0005WF-Sq for qemu-devel@nongnu.org; Mon, 09 Sep 2019 03:39:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7EGb-0005vE-WC for qemu-devel@nongnu.org; Mon, 09 Sep 2019 03:39:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40156) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7EGa-0005tU-Lh for qemu-devel@nongnu.org; Mon, 09 Sep 2019 03:39:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DAE03A46C32 for ; Mon, 9 Sep 2019 07:39:14 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-59.ams2.redhat.com [10.36.117.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50D945C1D8; Mon, 9 Sep 2019 07:39:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8AB7E268; Mon, 9 Sep 2019 09:39:11 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 9 Sep 2019 09:39:11 +0200 Message-Id: <20190909073911.24787-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Mon, 09 Sep 2019 07:39:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] ui/egl: fix framebuffer reads X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix egl_fb_read() to use the (destination) surface size instead of the (source) framebuffer source for glReadPixels. Pass the DisplaySurface instead of the pixeldata pointer to egl_fb_read() to make this possible. With that in place framebuffer reads work fine even if the surface and framebuffer sizes don't match, so we can remove the guest-triggerable asserts in egl_scanout_flush(). Buglink: https://bugzilla.redhat.com//show_bug.cgi?id=3D1749659 Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/ui/egl-helpers.h | 2 +- ui/egl-headless.c | 4 +--- ui/egl-helpers.c | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index dad19e9873fb..94a4b3e6f3bd 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -25,7 +25,7 @@ void egl_fb_setup_for_tex(egl_fb *fb, int width, int heig= ht, GLuint texture, bool delete); void egl_fb_setup_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); +void egl_fb_read(DisplaySurface *dst, egl_fb *src); =20 void egl_texture_blit(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool fl= ip); void egl_texture_blend(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool f= lip, diff --git a/ui/egl-headless.c b/ui/egl-headless.c index 05b2e7d7b17f..fe2a0d1eab98 100644 --- a/ui/egl-headless.c +++ b/ui/egl-headless.c @@ -133,8 +133,6 @@ static void egl_scanout_flush(DisplayChangeListener *dc= l, if (!edpy->guest_fb.texture || !edpy->ds) { return; } - 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 if (edpy->cursor_fb.texture) { @@ -149,7 +147,7 @@ static void egl_scanout_flush(DisplayChangeListener *dc= l, egl_fb_blit(&edpy->blit_fb, &edpy->guest_fb, edpy->y_0_top); } =20 - egl_fb_read(surface_data(edpy->ds), &edpy->blit_fb); + egl_fb_read(edpy->ds, &edpy->blit_fb); dpy_gfx_update(edpy->dcl.con, x, y, w, h); } =20 diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c index edc53f6d3464..7c530c2825be 100644 --- a/ui/egl-helpers.c +++ b/ui/egl-helpers.c @@ -102,12 +102,12 @@ void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip) GL_COLOR_BUFFER_BIT, GL_LINEAR); } =20 -void egl_fb_read(void *dst, egl_fb *src) +void egl_fb_read(DisplaySurface *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); + glReadPixels(0, 0, surface_width(dst), surface_height(dst), + GL_BGRA, GL_UNSIGNED_BYTE, surface_data(dst)); } =20 void egl_texture_blit(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool fl= ip) --=20 2.18.1