Should be fixed with https://cgit.freedesktop.org/mesa/mesa/commit/?id=e11049f2c367192dfb1540855f6571a5e29b77ec.