This bisect put me here, which looks like it didn't go as planned again... http://cgit.freedesktop.org/mesa/mesa/commit/?id=78578b759943cb198d34eedc00b3408c1599f6ec I'm going to give up for now, maybe when I don't have so many other things going on I'll bisect it over a week or so.