commit 52bfbaae14cb1e382c7fe19186a7d73e6aa1a075
author Pekka Paalanen <ppaalanen@gmail.com> Wed Apr 11 16:19:37 2012 +0300
committer Pekka Paalanen <ppaalanen@gmail.com> Tue Apr 17 14:36:00 2012 +0300
tree 51294a1a3eac778c829b48dfd758e6a951d34a4d
parent 2eaa11e954c6fd93e18ca0f6dea56ea6d5c4516e

compositor: use GL_EXT_unpack_subimage only if available

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 03f0eb1..e0cba67 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1166,6 +1166,33 @@
 }
 
 static void
+texture_set_subimage(struct weston_surface *surface,
+		     int32_t x, int32_t y, int32_t width, int32_t height)
+{
+	glBindTexture(GL_TEXTURE_2D, surface->texture);
+
+#ifdef GL_UNPACK_ROW_LENGTH
+	/* Mesa does not define GL_EXT_unpack_subimage */
+
+	if (surface->compositor->has_unpack_subimage) {
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, surface->pitch);
+		glPixelStorei(GL_UNPACK_SKIP_PIXELS, x);
+		glPixelStorei(GL_UNPACK_SKIP_ROWS, y);
+
+		glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height,
+				GL_BGRA_EXT, GL_UNSIGNED_BYTE,
+				wl_shm_buffer_get_data(surface->buffer));
+		return;
+	}
+#endif
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+		     surface->pitch, surface->buffer->height, 0,
+		     GL_BGRA_EXT, GL_UNSIGNED_BYTE,
+		     wl_shm_buffer_get_data(surface->buffer));
+}
+
+static void
 surface_damage(struct wl_client *client,
 	       struct wl_resource *resource,
 	       int32_t x, int32_t y, int32_t width, int32_t height)
@@ -1174,16 +1201,8 @@
 
 	weston_surface_damage_rectangle(es, x, y, width, height);
 
-	if (es->buffer && wl_buffer_is_shm(es->buffer)) {
-		glBindTexture(GL_TEXTURE_2D, es->texture);
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, es->pitch);
-		glPixelStorei(GL_UNPACK_SKIP_PIXELS, x);
-		glPixelStorei(GL_UNPACK_SKIP_ROWS, y);
-
-		glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height,
-				GL_BGRA_EXT, GL_UNSIGNED_BYTE,
-				wl_shm_buffer_get_data(es->buffer));
-	}
+	if (es->buffer && wl_buffer_is_shm(es->buffer))
+		texture_set_subimage(es, x, y, width, height);
 }
 
 static void
@@ -2372,10 +2391,8 @@
 		return -1;
 	}
 
-	if (!strstr(extensions, "GL_EXT_unpack_subimage")) {
-		fprintf(stderr, "GL_EXT_unpack_subimage not available\n");
-		return -1;
-	}
+	if (strstr(extensions, "GL_EXT_unpack_subimage"))
+		ec->has_unpack_subimage = 1;
 
 	extensions =
 		(const char *) eglQueryString(ec->display, EGL_EXTENSIONS);