On Thu, 4 Mar 2010 19:15:42 +0100 Mario Kleiner <[email protected]> wrote:
> On Mar 4, 2010, at 7:06 PM, Jesse Barnes wrote: > > > Yeah, I'll try to apply your series on top and re-post it. > > Thanks. I'll just wait for updates from you then. Can i simply pull > from your own xserver branch again to get a consistent view of the > new situation? I'd then look at the thing again and see if anything > still clashes or not. Sure, I'll update my tree with all this stuff. Give me a few minutes. > > > > I know this one affects some of the things we discussed, since it > > makes > > offscreen drawing vs. swap interval even more broken than before (i.e. > > swap interval and throttling will both be broken when a drawable isn't > > being displayed), but on the other hand it'll prevent hangs, so that's > > good. > > Don't think the combined patches will introduce more offscreen > brokenness than before, but reduce brokenness for the onscreen/non > redirected cases quite a bit. Yes, that's another plus side. :) > I just meant that you changed lines of code very close to my changes, > so my stuff will probably fail to merge and looking at it it seems > that the amount of breakage/merge conflicts to fix will be much > smaller if my patch is applied first, then yours on top of it instead > of the other way round. Yep, there were definitely some conflicts. The last patch I posted should have those fixed up. Now I have to write an OML sync test case to check it (and fix another bug related to exposing the extension erroneously). Thanks, -- Jesse Barnes, Intel Open Source Technology Center _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
