commit 0d5fe3a2312624674b8484f8255ae5f6ed0fba72
author Kristian Høgsberg <krh@bitplanet.net> Thu Aug 15 15:17:57 2013 -0700
committer Kristian Høgsberg <krh@bitplanet.net> Fri Aug 16 10:56:00 2013 -0700
tree 392ef8e95ab01a5c4d8a6b559b4544796c2a5224
parent 8e7a8bdeea37640abe0013425934f86a63e36cf8

nested: The wl_resouce is the buffer, not the wl_resource user data

clients/nested.c

diff --git a/clients/nested.c b/clients/nested.c
index c1c0543..244bbca 100644
--- a/clients/nested.c
+++ b/clients/nested.c
@@ -269,7 +269,6 @@
 {
 	struct nested_surface *surface = wl_resource_get_user_data(resource);
 	struct nested *nested = surface->nested;
-	void *buffer = wl_resource_get_user_data(buffer_resource);
 	EGLint format, width, height;
 	cairo_device_t *device;
 
@@ -277,7 +276,7 @@
 		wl_buffer_send_release(surface->buffer_resource);
 
 	surface->buffer_resource = buffer_resource;
-	if (!query_buffer(nested->egl_display, buffer,
+	if (!query_buffer(nested->egl_display, buffer_resource,
 			  EGL_TEXTURE_FORMAT, &format)) {
 		fprintf(stderr, "attaching non-egl wl_buffer\n");
 		return;
@@ -298,14 +297,15 @@
 	}
 
 	surface->image = create_image(nested->egl_display, NULL,
-				      EGL_WAYLAND_BUFFER_WL, buffer, NULL);
+				      EGL_WAYLAND_BUFFER_WL, buffer_resource,
+				      NULL);
 	if (surface->image == EGL_NO_IMAGE_KHR) {
 		fprintf(stderr, "failed to create img\n");
 		return;
 	}
 
-	query_buffer(nested->egl_display, buffer, EGL_WIDTH, &width);
-	query_buffer(nested->egl_display, buffer, EGL_HEIGHT, &height);
+	query_buffer(nested->egl_display, buffer_resource, EGL_WIDTH, &width);
+	query_buffer(nested->egl_display, buffer_resource, EGL_HEIGHT, &height);
 
 	device = display_get_cairo_device(nested->display);
 	surface->cairo_surface =