No subject

ctx->VertexProgram.PointSizeEnabled is covered by _NEW_PROGRAM.

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 src/mesa/drivers/dri/i965/brw_sf_state.c  |    2 ++
 src/mesa/drivers/dri/i965/gen6_sf_state.c |    2 +-
 src/mesa/drivers/dri/i965/gen7_sf_state.c |    3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_sf_state.c b/src/mesa/drivers/dri/i965/brw_sf_state.c
index 3b7a4db..9a4416b 100644
--- a/src/mesa/drivers/dri/i965/brw_sf_state.c
+++ b/src/mesa/drivers/dri/i965/brw_sf_state.c
@@ -272,6 +272,7 @@ static void upload_sf_unit( struct brw_context *brw )
    sf->sf7.point_size = CLAMP(rint(CLAMP(ctx->Point.Size,
 					 ctx->Point.MinSize,
 					 ctx->Point.MaxSize)), 1, 255) * (1<<3);
+   /* _NEW_PROGRAM */
    sf->sf7.use_point_size_state = !(ctx->VertexProgram.PointSizeEnabled ||
 				    ctx->Point._Attenuated);
    sf->sf7.aa_line_distance_mode = 0;
@@ -313,6 +314,7 @@ static void upload_sf_unit( struct brw_context *brw )
 const struct brw_tracked_state brw_sf_unit = {
    .dirty = {
       .mesa  = (_NEW_POLYGON | 
+		_NEW_PROGRAM |
 		_NEW_LIGHT |
 		_NEW_LINE | 
 		_NEW_POINT | 
diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c
index d8b4052..c1ad359 100644
--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
@@ -247,7 +247,7 @@ upload_sf_state(struct brw_context *brw)
       dw3 |= GEN6_SF_LINE_END_CAP_WIDTH_1_0;
    }
 
-   /* _NEW_POINT */
+   /* _NEW_PROGRAM | _NEW_POINT */
    if (!(ctx->VertexProgram.PointSizeEnabled ||
 	 ctx->Point._Attenuated))
       dw4 |= GEN6_SF_USE_STATE_POINT_WIDTH;
diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c
index abcfa99..8637cb5 100644
--- a/src/mesa/drivers/dri/i965/gen7_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c
@@ -248,7 +248,7 @@ upload_sf_state(struct brw_context *brw)
 
    dw3 = 0;
 
-   /* _NEW_POINT */
+   /* _NEW_PROGRAM | _NEW_POINT */
    if (!(ctx->VertexProgram.PointSizeEnabled || ctx->Point._Attenuated))
       dw3 |= GEN6_SF_USE_STATE_POINT_WIDTH;
 
@@ -283,6 +283,7 @@ const struct brw_tracked_state gen7_sf_state = {
    .dirty = {
       .mesa  = (_NEW_LIGHT |
 		_NEW_POLYGON |
+		_NEW_PROGRAM |
 		_NEW_LINE |
 		_NEW_SCISSOR |
 		_NEW_BUFFERS |
-- 
1.7.7.5