diff options
author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-03-07 17:21:20 +0100 |
---|---|---|
committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-03-07 17:39:10 +0100 |
commit | 789741c6a226a33fde8ed5dd08e16d910e25d298 (patch) | |
tree | 3fbc266b8d96eb7b1b195f4f1588b168f7d2c4b5 | |
parent | f172eae8b23d0612865895c52af745021ae20a4c (diff) |
gbm_dri: Fix DRIimage lookup callbacklookup-fix
That is by making the dri extension variables static in gbm_dri.c.
The image_lookup_extension is provided by egl_dri2 when using x11 or wayland
platforms, when using the drm platform, gbm_dri has a wrapper for it.
Both use the same variables name image_lookup_extension.
Since -fvisibility=hidden was (probably by mistake) removed when converting to
automake, the "image_lookup_extension" symbol from egl_dri2.c became exported
in libEGL.so, so "image_lookup_extension" from gbm_dri.c was ignored.
This resulted in calling incorrect callbacks.
We cant make the image_lookup_extension static in egl_dri2.c right now,
since its used across multiple files.
Bugzilla: https://bugs.freedesktop.org/attachment.cgi?id=58099
-rw-r--r-- | src/gbm/backends/dri/gbm_dri.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 34f07de4bb..98f14cd534 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -54,11 +54,11 @@ dri_lookup_egl_image(__DRIscreen *screen, void *image, void *data) return dri->lookup_image(screen, image, dri->lookup_user_data); } -const __DRIuseInvalidateExtension use_invalidate = { +static const __DRIuseInvalidateExtension use_invalidate = { { __DRI_USE_INVALIDATE, 1 } }; -const __DRIimageLookupExtension image_lookup_extension = { +static const __DRIimageLookupExtension image_lookup_extension = { { __DRI_IMAGE_LOOKUP, 1 }, dri_lookup_egl_image }; |