mesa: remove DD_TRI_SMOOTH flag

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

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 77629b9f125444247f5951b0a0ef4644911df514..418f0e2e6b54b60bc0ea0d97fb4c6e25f57d2886 100644 (file)
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -100,12 +100,11 @@ void
 _mesa_print_tri_caps( const char *name, GLuint flags )
 {
    _mesa_debug(NULL,
-          "%s: (0x%x) %s%s%s\n",
+          "%s: (0x%x) %s%s\n",
           name,
           flags,
           (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",
-          (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",
-          (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : ""
+          (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : ""
       );
 }
 

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index fe15716249087298bf7b6f186574367831f09886..22a75c8c5d16772445872331eea97a53a878e489 100644 (file)
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -623,7 +623,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
             return;
          FLUSH_VERTICES(ctx, _NEW_POLYGON);
          ctx->Polygon.SmoothFlag = state;
-         ctx->_TriangleCaps ^= DD_TRI_SMOOTH;
          break;
       case GL_POLYGON_STIPPLE:
          if (ctx->API != API_OPENGL_COMPAT)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3d77fbac274b3864f8704b8dc2a34fc56c1143fb..0463689587b6ecbab98dae16512160cbb5bac098 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3169,7 +3169,6 @@ struct gl_matrix_stack
 /*@{*/
 #define DD_TRI_LIGHT_TWOSIDE        (1 << 1)
 #define DD_TRI_UNFILLED             (1 << 2)
-#define DD_TRI_SMOOTH               (1 << 3)
 /*@}*/
 
 

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 01059fa32d7722b7d87da0e38af3b13bb54fced6..f7248647beb3bb3462f69b13689da6c876c43014 100644 (file)
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -330,8 +330,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state)
     * Polygons
     */
    if (1/*new_state & _NEW_POLYGON*/) {
-      if (ctx->Polygon.SmoothFlag)
-         ctx->_TriangleCaps |= DD_TRI_SMOOTH;
       if (ctx->Polygon.FrontMode != GL_FILL
           || ctx->Polygon.BackMode != GL_FILL)
          ctx->_TriangleCaps |= DD_TRI_UNFILLED;