Attachment 58127 Details for Bug 47028 – gbm_dri: Fix DRIimage lookup callback

[patch] gbm_dri: Fix DRIimage lookup callback

0001-gbm_dri-Fix-DRIimage-lookup-callback.patch (text/plain), 1.69 KB, created by Benjamin Franzke on 2012-03-07 09:08:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Franzke

Created: 2012-03-07 09:08:13 UTC

Size: 1.69 KB

patch

obsolete

>From 789741c6a226a33fde8ed5dd08e16d910e25d298 Mon Sep 17 00:00:00 2001
>From: Benjamin Franzke <benjaminfranzke@googlemail.com>
>Date: Wed, 7 Mar 2012 17:21:20 +0100
>Subject: [PATCH] gbm_dri: Fix DRIimage lookup callback
>
>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
>---
> 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 34f07de..98f14cd 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
> };
>-- 
>1.7.3.4
>

Actions: View | Splinter Review

Attachments on bug 47028: 58099 | 58127

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.