[Mesa-dev] Misc asortment of minor fixes

[Edward O'Callaghan]

The only functional change in this series is taking off the breaks on
higher GLSL versions than 4.1. This will likely be relevant by weeks
end.