Mesa (master): i965: Fix gen6 pointsize handling to match pre-gen6.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: d3163912c1f15fcb44beb33c5069799d56e1dc16
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3163912c1f15fcb44beb33c5069799d56e1dc16

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Oct  6 17:29:29 2010 -0700

i965: Fix gen6 pointsize handling to match pre-gen6.

Fixes point-line-no-cull.
Bug #30532

---

 src/mesa/drivers/dri/i965/gen6_sf_state.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c
index 6c88338..b2a6bd0 100644
--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
@@ -125,7 +125,8 @@ upload_sf_state(struct brw_context *brw)
    }
 
    /* _NEW_POINT */
-   if (ctx->Point._Attenuated)
+   if (!(ctx->VertexProgram.PointSizeEnabled ||
+	 ctx->Point._Attenuated))
       dw4 |= GEN6_SF_USE_STATE_POINT_WIDTH;
 
    dw4 |= U_FIXED(CLAMP(ctx->Point.Size, 0.125, 225.875), 3) <<