Use glTexSubImage to update the pixels.

glTexImage causes respecification.  The DRM buffer a client renders to
will be different from that used to create the wl_buffer.

diff --git a/clients/window.c b/clients/window.c
index 24ec5b0e03c328a357b48b68a8f1ddf769e71f5e..2dd71358a4fcb437627781d429b71c9cbdd02955 100644 (file)
--- a/clients/window.c
+++ b/clients/window.c
@@ -275,9 +275,8 @@ display_create_drm_surface_from_file(struct display *display,
        }
 
        surface = display_create_drm_surface(display, rect);
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
-                    rect->width, rect->height,
-                    0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rect->width, rect->height,
+                       GL_RGBA, GL_UNSIGNED_BYTE, pixels);
 
        gdk_pixbuf_unref(pixbuf);
 

diff --git a/compositor/compositor.c b/compositor/compositor.c
index 7daacea9c4847c4ad7596cfe59abf72fdf11c0f9..94e70a56b33a88278a7789a72797029001a20b71 100644 (file)
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -192,8 +192,8 @@ texture_from_png(const char *filename, int width, int height)
        else
                format = GL_RGB;
 
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
-                    width, height, 0, format, GL_UNSIGNED_BYTE, data);
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height,
+                       format, GL_UNSIGNED_BYTE, data);
 
        gdk_pixbuf_unref(pixbuf);