Created attachment 88190 [details] [review] Patch to address this bug. I've sent the attached patch to mesa-dev as well, please review/commit.