Also, I think we shouldn't do anything in the shader compiler. A simple workaround in Mesa should be enough.