Created attachment 105645 [details] [review]
proposed fix

Does this patch fix the piglit failures? For doing a full piglit run, I'd
recommend comparing the commit before before my series where the mess started
(d72d67832bd7a5f2aa0c402333a7de6804ad35ef) and the last commit
(e78a01d5e6f77e075fe667a0f0ccb10d89c0dd58) with my fix on top.