From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Dongwon Kim <dongwon.kim@intel.com>,
Vivek Kasireddy <vivek.kasireddy@intel.com>,
Gerd Hoffmann <kraxel@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 6/6] ui/gtk-egl: blitting partial guest fb to the proper scanout surface
Date: Fri, 5 Nov 2021 12:30:43 +0100 [thread overview]
Message-ID: <20211105113043.4059361-7-kraxel@redhat.com> (raw)
In-Reply-To: <20211105113043.4059361-1-kraxel@redhat.com>
From: Dongwon Kim <dongwon.kim@intel.com>
eb_fb_blit should be able to blit partial image of guest display (blob res)
in case multiple displays are configured for the guest and they are set as extended-
desktop mode.
v2: egl_fb includes dmabuf info then make egl_fb_blit position and size
parameters programmed in dmabuf structure (previously position/size
parameters were given to egl_fb_blit separately)
(Vivek Kasireddy)
changed the commit message as there is no interface change to egl_fb_blit
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
Message-Id: <20211104065153.28897-6-dongwon.kim@intel.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/egl-helpers.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index 385a3fa75223..3a88245b6780 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -90,14 +90,31 @@ 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)
{
- GLuint y1, y2;
+ GLuint x1 = 0;
+ GLuint y1 = 0;
+ GLuint x2, y2;
+ GLuint w = src->width;
+ GLuint h = src->height;
glBindFramebuffer(GL_READ_FRAMEBUFFER, src->framebuffer);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dst->framebuffer);
glViewport(0, 0, dst->width, dst->height);
- y1 = flip ? src->height : 0;
- y2 = flip ? 0 : src->height;
- glBlitFramebuffer(0, y1, src->width, y2,
+
+ if (src->dmabuf) {
+ x1 = src->dmabuf->x;
+ y1 = src->dmabuf->y;
+ w = src->dmabuf->scanout_width;
+ h = src->dmabuf->scanout_height;
+ }
+
+ w = (x1 + w) > src->width ? src->width - x1 : w;
+ h = (y1 + h) > src->height ? src->height - y1 : h;
+
+ y2 = flip ? y1 : h + y1;
+ y1 = flip ? h + y1 : y1;
+ x2 = x1 + w;
+
+ glBlitFramebuffer(x1, y1, x2, y2,
0, 0, dst->width, dst->height,
GL_COLOR_BUFFER_BIT, GL_LINEAR);
}
--
2.31.1
next prev parent reply other threads:[~2021-11-05 11:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 11:30 [PULL 0/6] Egl 20211105 patches Gerd Hoffmann
2021-11-05 11:30 ` [PULL 1/6] virtio-gpu: splitting one extended mode guest fb into n-scanouts Gerd Hoffmann
2021-11-05 11:30 ` [PULL 2/6] ui/gtk-egl: un-tab and re-tab should destroy egl surface and context Gerd Hoffmann
2021-11-05 11:30 ` [PULL 3/6] ui/gtk-egl: make sure the right context is set as the current Gerd Hoffmann
2021-11-05 11:30 ` [PULL 4/6] ui/gtk-egl: guest fb texture needs to be regenerated when reinitializing egl Gerd Hoffmann
2021-11-06 20:32 ` Laurent Vivier
2021-11-08 8:07 ` Philippe Mathieu-Daudé
2021-11-05 11:30 ` [PULL 5/6] ui/gtk: gd_draw_event returns FALSE when no cairo surface is bound Gerd Hoffmann
2021-11-05 11:30 ` Gerd Hoffmann [this message]
2021-11-05 17:13 ` [PULL 0/6] Egl 20211105 patches Richard Henderson
2021-11-05 18:26 ` Philippe Mathieu-Daudé
2021-11-05 18:49 ` Philippe Mathieu-Daudé
2021-11-08 8:12 ` Mark Cave-Ayland
2021-11-08 8:17 ` Philippe Mathieu-Daudé
2021-11-08 9:22 ` Daniel P. Berrangé
2021-11-08 9:36 ` Gerd Hoffmann
2021-11-08 9:37 ` Philippe Mathieu-Daudé
2021-11-08 9:41 ` Mark Cave-Ayland
2021-11-08 9:47 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211105113043.4059361-7-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=dongwon.kim@intel.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vivek.kasireddy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).