From 6b309f736865feb395499cdc357de093f5bdf564 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 27 Oct 2016 17:41:55 +0200 Subject: [PATCH] gbm: set up the interop extension for egl/drm breaking libgbm -> libEGL ABI? Acked-by: Alex Deucher Reviewed-by: Emil Velikov --- src/egl/drivers/dri2/platform_drm.c | 1 + src/gbm/backends/dri/gbm_dri.c | 1 + src/gbm/backends/dri/gbm_driint.h | 1 + 3 files changed, 3 insertions(+) diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index ea1a7f12643..20993147c8a 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -712,6 +712,7 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) dri2_dpy->flush = dri2_dpy->gbm_dri->flush; dri2_dpy->swrast = dri2_dpy->gbm_dri->swrast; dri2_dpy->driver_configs = dri2_dpy->gbm_dri->driver_configs; + dri2_dpy->interop = dri2_dpy->gbm_dri->interop; dri2_dpy->gbm_dri->lookup_image = dri2_lookup_egl_image; dri2_dpy->gbm_dri->lookup_user_data = disp; diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 51c4117ba70..5cd7318d57b 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -246,6 +246,7 @@ static struct dri_extension_match dri_core_extensions[] = { { __DRI2_FLUSH, 1, offsetof(struct gbm_dri_device, flush) }, { __DRI_IMAGE, 1, offsetof(struct gbm_dri_device, image) }, { __DRI2_FENCE, 2, offsetof(struct gbm_dri_device, fence), 1 }, + { __DRI2_INTEROP, 1, offsetof(struct gbm_dri_device, interop), 1 }, { NULL, 0, 0 } }; diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h index 26376efb1ed..29a8ec25a1e 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -58,6 +58,7 @@ struct gbm_dri_device { const __DRIswrastExtension *swrast; const __DRI2flushExtension *flush; const __DRIdri2LoaderExtension *loader; + const __DRI2interopExtension *interop; const __DRIconfig **driver_configs; const __DRIextension **loader_extensions; -- 2.11.0