Probably should be solved by this: http://cgit.freedesktop.org/~deathsimple/mesa/commit/?id=9334f7d0f16738b4817e853d6d8cb1432953abfb