[Mesa-dev] [PATCH] mesa: enable remap table when --enable-shared-glapi

[Kenneth Graunke]

On 02/08/2012 05:21 PM, Matt Turner wrote:
> On Wed, Feb 8, 2012 at 8:19 PM, Brian Paul<brianp at vmware.com>  wrote:
>> On 02/08/2012 06:07 PM, Matt Turner wrote:
>>>
>>> On Wed, Feb 8, 2012 at 8:03 PM, Brian Paul<brianp at vmware.com>    wrote:
>>>>
>>>> On 02/08/2012 05:39 PM, Matt Turner wrote:
>>>>>
>>>>>
>>>>> On Wed, Feb 8, 2012 at 7:30 PM, Brian Paul<brianp at vmware.com>      wrote:
>>>>>>
>>>>>>
>>>>>> On 02/08/2012 09:48 AM, Matt Turner wrote:
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> On Mon, Feb 6, 2012 at 12:05 PM, Matt Turner<mattst88 at gmail.com>
>>>>>>>   wrote:
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> From: Chia-I Wu<olv at lunarg.com>
>>>>>>>>
>>>>>>>> As libGL will use libglapi for function lookups, we need to enable
>>>>>>>> the
>>>>>>>> remap
>>>>>>>> table.
>>>>>>>>
>>>>>>>> Tested-by: Matt Turner<mattst88 at gmail.com>
>>>>>>>> Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45660
>>>>>>>> ---
>>>>>>>>   configure.ac |    3 +++
>>>>>>>>   1 files changed, 3 insertions(+), 0 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/configure.ac b/configure.ac
>>>>>>>> index af1e914..609cdea 100644
>>>>>>>> --- a/configure.ac
>>>>>>>> +++ b/configure.ac
>>>>>>>> @@ -698,6 +698,9 @@ AC_ARG_ENABLE([shared-glapi],
>>>>>>>>   SHARED_GLAPI="0"
>>>>>>>>   if test "x$enable_shared_glapi" = xyes; then
>>>>>>>>      SHARED_GLAPI="1"
>>>>>>>> +    # libGL will use libglapi for function lookups (IN_DRI_DRIVER
>>>>>>>> means
>>>>>>>> to use
>>>>>>>> +    # the remap table)
>>>>>>>> +    DEFINES="$DEFINES -DIN_DRI_DRIVER"
>>>>>>>>   fi
>>>>>>>>   AC_SUBST([SHARED_GLAPI])
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> Brian,
>>>>>>>
>>>>>>> This fixes a bug that you reported with shared-glapi. Could you take a
>>>>>>> look?
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> I don't recall filing a bug about this, but it looks good to me.
>>>>>>
>>>>>> -Brian
>>>>>
>>>>>
>>>>>
>>>>> It was on the mailing list,
>>>>> http://lists.freedesktop.org/archives/mesa-dev/2012-January/018004.html
>>>>
>>>>
>>>>
>>>> That problem seems to have been fixed at some point.  I didn't have to
>>>> apply
>>>> the above patch.
>>>>
>>>> -Brian
>>>
>>>
>>> The problem only exists with shared-glapi, and the context of the
>>> other thread was that I'd committed a patch to make us always build
>>> shared-glapi. I think maybe you aren't building with shared-glapi? I
>>> tested when I sent the patch and fbotexture didn't work with
>>> shared-glapi without this patch.
>>
>>
>> I haven't used --enable-shared-glapi until just now.
>>
>> The options I used previously were:
>> ./configure --enable-xlib-glx --disable-dri --enable-debug
>>
>> Anyway, I just did a build with
>> ./configure --enable-xlib-glx --disable-dri --enable-debug
>> --enable-shared-glapi
>> and fbotexture failed.
>>
>> But after applying the above patch, and rebuilding from scratch, fbotexture
>> runs correctly now (as you indicated).  Thanks.
>>
>> Tested-by: Brian Paul<brianp at vmware.com>
>>
>> -Brian
>
> Awesome, thank you for testing! Thanks to Chia-I for fixing!

Thanks for fixing and testing this!

Now the question is: can we reapply Matt's patch, removing the 
--enable-shared-glapi option and making it always on?  That would be great.