[Mesa3d-dev] recent changes to Xgl

[Brian Paul]

David Reveman wrote:
> On Wed, 2005-06-08 at 07:07 -0600, Brian Paul wrote:
> 
>>David Reveman wrote:
>>
>>>On Tue, 2005-06-07 at 20:17 -0600, Brian Paul wrote:
>>>
>>>
>>>>David Reveman wrote:
>>>>
>>>>
>>>>>I committed a large set of changes to the xserver tree earlier today.
>>>>>Pbuffers are no longer used by Xgl for offscreen rendering and indirect
>>>>>GLX should now be working much better.
>>>>>
>>>>>As no other server than Xgl is using the GLX code in the xserver tree,
>>>>>I've committed the changes needed to build Xgl with GLX support. This
>>>>>includes a preliminary implementation of GLX_MESA_render_texture (I'll
>>>>>send another mail regarding this shortly).
>>>>>
>>>>>The following set of patches will need to be applied to Mesa CVS in
>>>>>order to build the xserver tree with GLX support.
>>>>>
>>>>>mesa-driver-x11-fbo-span-fix.diff
>>>>>mesa-driver-x11-fbo-back-buffer-fix.diff
>>>>>mesa-gl_mangle-fbo-update.diff (As gl_mangle.h is automatically
>>>>>generated this isn't the correct fix, but as I couldn't find the source
>>>>>to that, I've just done this manually for now)
>>>>>
>>>>>please feel free to commit any of these patches.
>>>>
>>>>Done.  Thanks!
>>>
>>>
>>>It seems like this:
>>>
>>>"gl.h:GLAPI void GLAPIENTRY"
>>>
>>>was somehow accidentally added to line 1496 of gl_mangle.h. If I remove
>>>it everything builds fine now. 
>>
>>Fixed.  I don't know where that line is coming from.  When I 
>>regenerate the file ("sh gl_mangle.h > gl_mangle.h-new") it appears again.
>>
> 
> 
> Oh, gl_mangle.h is generated by executing gl_mangle.h in sh, OK. The
> problem seems to be that two function prototypes in gl.h are slit into
> multiple lines. The attached patch should fix that.

That's it.  Thanks.

-Brian