diff mbox

[2/4] egl-headless: use framebuffer helper functions.

Message ID 20170606110459.9771-3-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann June 6, 2017, 11:04 a.m. UTC 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/egl-headless.c | 67 ++++++++++++++-----------------------------------------
 1 file changed, 17 insertions(+), 50 deletions(-)

Comments

Marc-André Lureau June 7, 2017, 9:02 p.m. UTC | #1 
Hi

The patch looks good to me, but I tried to use egl-headless for the first
time, and I get a weird crash on virgl init:
(gdb) bt
#0  0x00007fffd8cd935f in rawmemchr () at /lib64/libc.so.6
#1  0x00007fffd8cc1832 in _IO_str_init_static_internal () at
/lib64/libc.so.6
#2  0x00007fffd8cb37e7 in vsscanf () at /lib64/libc.so.6
#3  0x00007ffff6e818a6 in vsscanf () at /lib64/libasan.so.3
#4  0x00007ffff6e819d3 in sscanf () at /lib64/libasan.so.3
#5  0x00007ffff6bfe239 in vrender_get_glsl_version
(glsl_version=0x60e00001f2b8) at vrend_renderer.c:6026
#6  0x00007ffff6bfe239 in vrend_create_context (id=id@entry=0,
nlen=nlen@entry=0, debug_name=debug_name@entry=0x0) at vrend_renderer.c:4033
#7  0x00007ffff6c04f2f in vrend_renderer_context_create_internal (handle=0,
nlen=0, debug_name=0x0) at vrend_decode.c:1066
#8  0x00007ffff6bf72a3 in vrend_renderer_init (cbs=<optimized out>,
flags=0) at vrend_renderer.c:3874
#9  0x0000555556b52cc1 in virtio_gpu_virgl_init (g=0x633000008d10) at
/home/elmarco/src/qemu/hw/display/virtio-gpu-3d.c:623

This doesn't happen when I use virgl/spice (gl=on obviously)

I guess you don't know what's going on, and I will look further later, I
just thought it was worth to report in case you had an idea.

On Tue, Jun 6, 2017 at 3:05 PM Gerd Hoffmann <kraxel@redhat.com> wrote:

> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

---
>  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;
>
> +/* ------------------------------------------------------------------ */
> +
>  static void egl_refresh(DisplayChangeListener *dcl)
>  {
>      graphic_hw_update(dcl->con);
> @@ -38,8 +37,8 @@ static void egl_scanout_disable(DisplayChangeListener
> *dcl)
>  {
>      egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
>
> -    edpy->texture = 0;
> -    /* XXX: delete framebuffers here ??? */
> +    egl_fb_destroy(&edpy->guest_fb);
> +    egl_fb_destroy(&edpy->blit_fb);
>  }
>
>  static void egl_scanout_texture(DisplayChangeListener *dcl,
> @@ -52,34 +51,17 @@ static void egl_scanout_texture(DisplayChangeListener
> *dcl,
>  {
>      egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
>
> -    edpy->texture = backing_id;
>      edpy->y_0_top = backing_y_0_top;
>
>      /* 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);
>
>      /* dest framebuffer */
> -    if (!edpy->blit_framebuffer) {
> -        glGenFramebuffers(1, &edpy->blit_framebuffer);
> -        glGenTextures(1, &edpy->blit_texture);
> -        edpy->width = 0;
> -        edpy->height = 0;
> -    }
> -    if (edpy->width != backing_width || edpy->height != backing_height) {
> -        edpy->width   = backing_width;
> -        edpy->height  = 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  != backing_width ||
> +        edpy->blit_fb.height != backing_height) {
> +        egl_fb_destroy(&edpy->blit_fb);
> +        egl_fb_create_new_tex(&edpy->blit_fb, backing_width,
> backing_height);
>      }
>  }
>
> @@ -88,32 +70,17 @@ static void egl_scanout_flush(DisplayChangeListener
> *dcl,
>                                uint32_t w, uint32_t h)
>  {
>      egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
> -    GLuint y1, y2;
>
> -    if (!edpy->texture || !edpy->ds) {
> +    if (!edpy->guest_fb.texture || !edpy->ds) {
>          return;
>      }
> -    assert(surface_width(edpy->ds)  == edpy->width);
> -    assert(surface_height(edpy->ds) == edpy->height);
> +    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);
>
> -    /* 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 = edpy->y_0_top ? edpy->height : 0;
> -    y2 = 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);
>
> -    /* 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);
>  }
>
> --
> 2.9.3
>
>
> --
Marc-André Lureau
Gerd Hoffmann June 12, 2017, 8:20 a.m. UTC | #2 
On Wed, 2017-06-07 at 21:02 +0000, Marc-André Lureau wrote:
> Hi
> 
> The patch looks good to me, but I tried to use egl-headless for the
> first time, and I get a weird crash on virgl init:
> (gdb) bt
> #0  0x00007fffd8cd935f in rawmemchr () at /lib64/libc.so.6
> #1  0x00007fffd8cc1832 in _IO_str_init_static_internal () at
> /lib64/libc.so.6
> #2  0x00007fffd8cb37e7 in vsscanf () at /lib64/libc.so.6
> #3  0x00007ffff6e818a6 in vsscanf () at /lib64/libasan.so.3
> #4  0x00007ffff6e819d3 in sscanf () at /lib64/libasan.so.3
> #5  0x00007ffff6bfe239 in vrender_get_glsl_version
> (glsl_version=0x60e00001f2b8) at vrend_renderer.c:6026
> #6  0x00007ffff6bfe239 in vrend_create_context (id=id@entry=0, nlen=n
> len@entry=0, debug_name=debug_name@entry=0x0) at
> vrend_renderer.c:4033
> #7  0x00007ffff6c04f2f in vrend_renderer_context_create_internal
> (handle=0, nlen=0, debug_name=0x0) at vrend_decode.c:1066
> #8  0x00007ffff6bf72a3 in vrend_renderer_init (cbs=<optimized out>,
> flags=0) at vrend_renderer.c:3874
> #9  0x0000555556b52cc1 in virtio_gpu_virgl_init (g=0x633000008d10) at
> /home/elmarco/src/qemu/hw/display/virtio-gpu-3d.c:623
> 
> This doesn't happen when I use virgl/spice (gl=on obviously)
> 
> I guess you don't know what's going on,

No, havn't seen this before.

cheers,
  Gerd
diff mbox

Patch

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;
 
+/* ------------------------------------------------------------------ */
+
 static void egl_refresh(DisplayChangeListener *dcl)
 {
     graphic_hw_update(dcl->con);
@@ -38,8 +37,8 @@  static void egl_scanout_disable(DisplayChangeListener *dcl)
 {
     egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
 
-    edpy->texture = 0;
-    /* XXX: delete framebuffers here ??? */
+    egl_fb_destroy(&edpy->guest_fb);
+    egl_fb_destroy(&edpy->blit_fb);
 }
 
 static void egl_scanout_texture(DisplayChangeListener *dcl,
@@ -52,34 +51,17 @@  static void egl_scanout_texture(DisplayChangeListener *dcl,
 {
     egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
 
-    edpy->texture = backing_id;
     edpy->y_0_top = backing_y_0_top;
 
     /* 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);
 
     /* dest framebuffer */
-    if (!edpy->blit_framebuffer) {
-        glGenFramebuffers(1, &edpy->blit_framebuffer);
-        glGenTextures(1, &edpy->blit_texture);
-        edpy->width = 0;
-        edpy->height = 0;
-    }
-    if (edpy->width != backing_width || edpy->height != backing_height) {
-        edpy->width   = backing_width;
-        edpy->height  = 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  != backing_width ||
+        edpy->blit_fb.height != backing_height) {
+        egl_fb_destroy(&edpy->blit_fb);
+        egl_fb_create_new_tex(&edpy->blit_fb, backing_width, backing_height);
     }
 }
 
@@ -88,32 +70,17 @@  static void egl_scanout_flush(DisplayChangeListener *dcl,
                               uint32_t w, uint32_t h)
 {
     egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
-    GLuint y1, y2;
 
-    if (!edpy->texture || !edpy->ds) {
+    if (!edpy->guest_fb.texture || !edpy->ds) {
         return;
     }
-    assert(surface_width(edpy->ds)  == edpy->width);
-    assert(surface_height(edpy->ds) == edpy->height);
+    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);
 
-    /* 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 = edpy->y_0_top ? edpy->height : 0;
-    y2 = 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);
 
-    /* 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);
 }