[mutter/wip/nielsdg/meta-multi-texture-dmabuf: 2/4] WIP



commit b998b543f92b00ddd080647d1dcc90fbf9cfec54
Author: Niels De Graef <niels degraef barco com>
Date:   Wed Nov 6 16:01:41 2019 +0100

    WIP

 cogl/cogl/cogl-texture-2d.c        |  2 ++
 src/wayland/meta-wayland-dma-buf.c | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
index 21a3c3fb6..ea19c85ce 100644
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@@ -103,6 +103,8 @@ _cogl_texture_2d_create_base (CoglContext *ctx,
   _cogl_texture_init (tex, ctx, width, height, internal_format, loader,
                       &cogl_texture_2d_vtable);
 
+  g_warning ("cogl_texture_2d_vtable = %p", &cogl_texture_2d_vtable);
+
   tex_2d->mipmaps_dirty = TRUE;
   tex_2d->auto_mipmap = TRUE;
   tex_2d->is_get_data_supported = TRUE;
diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c
index 8af21f5d6..7b3a202c3 100644
--- a/src/wayland/meta-wayland-dma-buf.c
+++ b/src/wayland/meta-wayland-dma-buf.c
@@ -189,7 +189,10 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffer  *buffer,
                                             modifiers,
                                             error);
   if (egl_image == EGL_NO_IMAGE_KHR)
-    return FALSE;
+    {
+      g_debug ("Couldn't create EGLImage from DMA-buf: %s", (*error)->message);
+      return FALSE;
+    }
 
   /* FIXME: at this point, we might want to try importing each plane separately */
 
@@ -202,10 +205,14 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffer  *buffer,
                                                      flags,
                                                      error);
 
+  G_BREAKPOINT();
   meta_egl_destroy_image (egl, egl_display, egl_image, NULL);
 
-  if (!cogl_texture)
-    return FALSE;
+  if (cogl_texture == NULL)
+    {
+      g_debug ("Couldn't upload DMA-buf EGLImage: %s", *error? (*error)->message : "");
+      return FALSE;
+    }
 
   g_ptr_array_add (planes, COGL_TEXTURE (cogl_texture));
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]