!UPSTREAM: Fix GS: missing version 130 uniforms

TODO:
- Validate in piglit
- Move to appropriate place in the series