mesa: remove DD_POINT_ATTEN flag

For the i915 driver, make it a local macro.
v2: use conditional operator instead of bit shifting

Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 65b494910cd2801130f2a68537fdc7b00c71d156..24a84cbea5b8c136235c7c06451a50584538125d 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -945,6 +945,7 @@ intelFastRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint
 
 
 #define DD_LINE_STIPPLE (1 << 7)
+#define DD_POINT_ATTEN  (1 << 9)
 
 #define ANY_FALLBACK_FLAGS (DD_LINE_STIPPLE | DD_TRI_STIPPLE | DD_POINT_ATTEN)
 #define ANY_RASTER_FLAGS (DD_TRI_LIGHT_TWOSIDE | DD_TRI_OFFSET | DD_TRI_UNFILLED)
@@ -955,7 +956,8 @@ intelChooseRenderState(struct gl_context * ctx)
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct intel_context *intel = intel_context(ctx);
    GLuint flags = ctx->_TriangleCaps |
-      (ctx->Line.StippleFlag ? DD_LINE_STIPPLE : 0);
+      (ctx->Line.StippleFlag ? DD_LINE_STIPPLE : 0) |
+      (ctx->Point._Attenuated ? DD_POINT_ATTEN : 0);
    const struct gl_fragment_program *fprog = ctx->FragmentProgram._Current;
    bool have_wpos = (fprog && (fprog->Base.InputsRead & VARYING_BIT_POS));
    GLuint index = 0;

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 28da81f37be349e76e839bc515362fa8c4377c47..aae1d02bdb864b76b932f832e8e910445dc0ea6c 100644 (file)
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -100,15 +100,14 @@ void
 _mesa_print_tri_caps( const char *name, GLuint flags )
 {
    _mesa_debug(NULL,
-          "%s: (0x%x) %s%s%s%s%s%s\n",
+          "%s: (0x%x) %s%s%s%s%s\n",
           name,
           flags,
           (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",
           (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",
           (flags & DD_TRI_STIPPLE)         ? "tri-stipple, " : "",
           (flags & DD_TRI_OFFSET)          ? "tri-offset, " : "",
-          (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : "",
-          (flags & DD_POINT_ATTEN)         ? "point-atten, " : ""
+          (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : ""
       );
 }
 

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index fa58b17017284f21110c83cff33b2893c75ccc47..f91f35209940ea965cb3f2f83e55d01f3ced4662 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3172,7 +3172,6 @@ struct gl_matrix_stack
 #define DD_TRI_SMOOTH               (1 << 3)
 #define DD_TRI_STIPPLE              (1 << 4)
 #define DD_TRI_OFFSET               (1 << 5)
-#define DD_POINT_ATTEN              (1 << 9)
 /*@}*/
 
 

diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index c925d4cfd0c416dcd0f0b6f27c3208f20dba4405..3239c6f28042ed6a1e7d3408f7698b2bceefcd3e 100644 (file)
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -122,11 +122,6 @@ _mesa_PointParameterfv( GLenum pname, const GLfloat *params)
          ctx->Point._Attenuated = (ctx->Point.Params[0] != 1.0 ||
                                    ctx->Point.Params[1] != 0.0 ||
                                    ctx->Point.Params[2] != 0.0);
-
-         if (ctx->Point._Attenuated)
-            ctx->_TriangleCaps |= DD_POINT_ATTEN;
-         else
-            ctx->_TriangleCaps &= ~DD_POINT_ATTEN;
          break;
       case GL_POINT_SIZE_MIN_EXT:
          if (params[0] < 0.0F) {

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 4e66310afed8803a5bc203fc6d2a16a00f3c01ea..628e2755b20704bf032fdf2df1940c6dbbc393d1 100644 (file)
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -342,14 +342,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state)
 {
    ctx->_TriangleCaps = 0;
 
-   /*
-    * Points
-    */
-   if (1/*new_state & _NEW_POINT*/) {
-      if (ctx->Point._Attenuated)
-         ctx->_TriangleCaps |= DD_POINT_ATTEN;
-   }
-
    /*
     * Polygons
     */