[xserver patch v5 3/5] glx: Enforce a 1:1 correspondence between GLX and X11 windows.

[Pauli Nieminen]

2010/3/23 Ian Romanick <idr at freedesktop.org>:
> Kristian Høgsberg wrote:
>> 2010/3/22 Ian Romanick <idr at freedesktop.org>:
>>> Kristian Høgsberg wrote:
>>>> 2010/2/8 Francisco Jerez <currojerez at riseup.net>:
>>>>> The spec says (regarding glXCreateWindow): "If there is already a
>>>>> GLXFBConfig associated with win (as a result of a previous
>>>>> glXCreateWindow call), then a BadAlloc error is generated.". It will
>>>>> also come useful to implement DRI2InvalidateBuffers for the indirect
>>>>> case.
>>>>>
>>>>> Signed-off-by: Francisco Jerez <currojerez at riseup.net>
>>> I've put this version of this patch (with krh's R-b) in my GLX-fixes
>>> tree.  Are the all the rest in Kristian's dri2-invalidate tree?
>>
>> We dropped this one, and the rest is in my dri2-invalidate tree.
>
> Why was it dropped?  I believe that it enforced correct behavior.  If
> this really does need to be removed, any suggestions how to fix my tree?
> :(  git-revert seems the only way, but that makes for ugly history in a
> tree like this.

You can fix git history with git commit --amend and git rebase --onto.
If your tree mixes good and bad commit it would be easier to create
new branch and use git cherry-pick.