!UPSTREAM: gs: Fix gl_PointSizeIn

TODO:
- Better commit message
- Move to appropriate place in series
!UPSTREAM: i965/gs: Set current_annotation to NULL appropriately

TODO:
- Squash somewhere