[PULL xserver 1.10] GLX backport

[Jeremy Huddleston]

On Apr 5, 2011, at 18:02, Adam Jackson wrote:

> On 4/5/11 4:17 PM, Ian Romanick wrote:
>> On 04/05/2011 11:15 AM, Jeremy Huddleston wrote:
>>> There is still a ton of fat left in there... but most of the fat is
>>> rather benign (whitespace, deleting dead code, etc), so I don't have
>>> a problem with it if it's part of the whole package.
> 
> I tried a first cut series that narrowed down to just the really key bits (redoing _glapi_add_dispatch and the context tag rewrite), but there was enough change in context from other patches in the series that this was both mechanically easier and more obviously corresponds to master.

yeah.  Like I said though... the fat isn't the problem since it is "obviously right".  I don't mind fat as long as the meat is good!

...

>>> How would you feel about sitting on this until after 1.10.1 is out?
>>> If there is a pressing reason why this should be part of 1.10.1 (such
>>> as fixing clutter failures that were not in 1.9.5), then I'll
>>> certainly consider merging it for RC2 and pushing out 1.10.1 by a
>>> allow more time for testing feedback.
> 
> I can wait until 1.10.2.  There's at least one more GLX fix that logically belongs with this set, which I haven't sent a pull for master for yet so I didn't feel right including it in the stable branch.

Ok, then I'd like to merge them all (including the not-yet-on-master set) in at once after releasing 1.10.1

Thanks,
Jeremy