(In reply to comment #20)
> Created attachment 67586 [details] [review] [review]
> Possible fix
> 
> Does this patch fix the problem?

your patch works
tested with the latest mesa-version from git