Commit d2329237 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ui/egl: fix framebuffer reads 

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=1749659


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20190909073911.24787-1-kraxel@redhat.com
parent 89ea03a7

include/ui/egl-helpers.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void egl_fb_setup_for_tex(egl_fb *fb, int width, int height, 
                          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);



void egl_texture_blit(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool flip);

void egl_texture_blend(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool flip,

ui/egl-headless.c

+1 −3
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ static void egl_scanout_flush(DisplayChangeListener *dcl, 
    if (!edpy->guest_fb.texture || !edpy->ds) {

        return;

    }

    assert(surface_width(edpy->ds)  == edpy->guest_fb.width);

    assert(surface_height(edpy->ds) == edpy->guest_fb.height);

    assert(surface_format(edpy->ds) == PIXMAN_x8r8g8b8);



    if (edpy->cursor_fb.texture) {
@@ -149,7 +147,7 @@ static void egl_scanout_flush(DisplayChangeListener *dcl, 
        egl_fb_blit(&edpy->blit_fb, &edpy->guest_fb, edpy->y_0_top);

    }



    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);

}

ui/egl-helpers.c

+3 −3
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip) 
                      GL_COLOR_BUFFER_BIT, GL_LINEAR);

}



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));

}



void egl_texture_blit(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool flip)