mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-08-15 15:17:57 -07:00
parent 8e7a8bdeea
commit 0d5fe3a231
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/nested.c
+5 -5
View File
@@ -269,7 +269,6 @@ surface_attach(struct wl_client *client,
{ {
struct nested_surface *surface = wl_resource_get_user_data(resource); struct nested_surface *surface = wl_resource_get_user_data(resource);
struct nested *nested = surface->nested; struct nested *nested = surface->nested;
void *buffer = wl_resource_get_user_data(buffer_resource);
EGLint format, width, height; EGLint format, width, height;
cairo_device_t *device; cairo_device_t *device;
@@ -277,7 +276,7 @@ surface_attach(struct wl_client *client,
wl_buffer_send_release(surface->buffer_resource); wl_buffer_send_release(surface->buffer_resource);
surface->buffer_resource = 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)) { EGL_TEXTURE_FORMAT, &format)) {
fprintf(stderr, "attaching non-egl wl_buffer\n"); fprintf(stderr, "attaching non-egl wl_buffer\n");
return; return;
@@ -298,14 +297,15 @@ surface_attach(struct wl_client *client,
} }
surface->image = create_image(nested->egl_display, NULL, 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) { if (surface->image == EGL_NO_IMAGE_KHR) {
fprintf(stderr, "failed to create img\n"); fprintf(stderr, "failed to create img\n");
return; return;
} }
query_buffer(nested->egl_display, buffer, EGL_WIDTH, &width); query_buffer(nested->egl_display, buffer_resource, EGL_WIDTH, &width);
query_buffer(nested->egl_display, buffer, EGL_HEIGHT, &height); query_buffer(nested->egl_display, buffer_resource, EGL_HEIGHT, &height);
device = display_get_cairo_device(nested->display); device = display_get_cairo_device(nested->display);
surface->cairo_surface = surface->cairo_surface =