I went ahead and pushed a split up version of attachment 75373 [details] [review] to mesa: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ebf83f109db9dde89830d5844107c936cf42e4d http://cgit.freedesktop.org/mesa/mesa/commit/?id=8442b67f5f3aedbfdb4446164dd09d4eaeda4888 9.1 is supposed to be released today and even if the patch isn't perfect for everyone yet, it's a lot better than it was before. I'll keep this bug open and we can continue to work on this until we get it nailed.