From 46cc022d5d392802e60415cc2d0da3969c8d6981 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 11 May 2017 16:46:51 +0100 Subject: [PATCH] gbm: manage only the required set of DRI extensions Currently GBM attempts to know all the extensions that might be required by EGL/DRM [at some later stage]. That is a bit unclear and we often forget to update GBM as EGL gets attention. To avoid that, simply let EGL manage it's own required extensions based on the base primitive (screen) we provide it. v2: Rework the approach - GBM should not dive into EGL/DRM. Signed-off-by: Emil Velikov Tested-by: Rob Herring --- src/gbm/backends/dri/gbm_dri.c | 1 - src/gbm/backends/dri/gbm_driint.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 9b08ae31a50..7fb569078b2 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -256,7 +256,6 @@ 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, 1, 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 68220cb85d0..db9038a623a 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -56,7 +56,6 @@ struct gbm_dri_device { const __DRIimageExtension *image; const __DRIswrastExtension *swrast; const __DRI2flushExtension *flush; - const __DRI2interopExtension *interop; const __DRIconfig **driver_configs; const __DRIextension **loader_extensions; -- 2.30.2