From 360a141f24a9d00891665b7fedb77ffb116944ca Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Thu, 26 Sep 2013 12:25:11 -0700 Subject: wayland: Don't rely on static variable for identifying wl_drm buffers Now that libEGL has been fixed to not leak all kinds of symbols, gbm links to its own copy of the libwayland-drm.a helper library. That means we can't rely on comparing the addresses of a static vtable symbol in that library to determine if a wl_buffer is a wl_drm_buffer. Instead, we move the vtable into the wl_drm struct and use that for comparing. https://bugs.freedesktop.org/show_bug.cgi?id=69437 Cc: 9.2 --- src/egl/drivers/dri2/egl_dri2.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/egl/drivers/dri2/egl_dri2.c') diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 04ab5649e52..18ecdc8df38 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1212,7 +1212,8 @@ dri2_create_image_wayland_wl_buffer(_EGLDisplay *disp, _EGLContext *ctx, EGLint err; int32_t plane; - buffer = wayland_drm_buffer_get((struct wl_resource *) _buffer); + buffer = wayland_drm_buffer_get(dri2_dpy->wl_server_drm, + (struct wl_resource *) _buffer); if (!buffer) return NULL; @@ -1852,6 +1853,10 @@ dri2_bind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp, if (!dri2_dpy->wl_server_drm) return EGL_FALSE; + /* We have to share the wl_drm instance with gbm, so gbm can convert + * wl_buffers to gbm bos. */ + dri2_dpy->gbm_dri->wl_drm = dri2_dpy->wl_server_drm; + return EGL_TRUE; } @@ -1877,10 +1882,11 @@ dri2_query_wayland_buffer_wl(_EGLDriver *drv, _EGLDisplay *disp, struct wl_resource *buffer_resource, EGLint attribute, EGLint *value) { + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct wl_drm_buffer *buffer; const struct wl_drm_components_descriptor *format; - buffer = wayland_drm_buffer_get(buffer_resource); + buffer = wayland_drm_buffer_get(dri2_dpy->wl_server_drm, buffer_resource); if (!buffer) return EGL_FALSE; -- cgit v1.2.3