summaryrefslogtreecommitdiff
path: root/src/gbm
diff options
context:
space:
mode:
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2013-07-18 15:11:25 +0300
committerKristian Høgsberg <krh@bitplanet.net>2013-08-07 10:37:58 -0700
commit8d29b5271a2e66fc78436be31ed6748ff006f0cb (patch)
treeb8a28a8c8fe46f04decaf3229a936c1bff110a80 /src/gbm
parent602351dd58c11af072f706e41ff1a204dac26a86 (diff)
egl: Update to Wayland 1.2 server API
Since Wayland 1.2, struct wl_buffer and a few functions are deprecated. References to wl_buffer are replaced with wl_resource and some getter functions and calls to deprecated functions are replaced with the proper new API. The latter changes are related to resource versioning. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Diffstat (limited to 'src/gbm')
-rw-r--r--src/gbm/backends/dri/gbm_dri.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index a3a05307c26..f7da79cac14 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -374,9 +374,10 @@ gbm_dri_bo_import(struct gbm_device *gbm,
#if HAVE_WAYLAND_PLATFORM
case GBM_BO_IMPORT_WL_BUFFER:
{
- struct wl_drm_buffer *wb = (struct wl_drm_buffer *) buffer;
+ struct wl_drm_buffer *wb;
- if (!wayland_buffer_is_drm(buffer))
+ wb = wayland_drm_buffer_get((struct wl_resource *) buffer);
+ if (!wb)
return NULL;
image = wb->driver_buffer;