---
src/mesa/main/debug.c | 5 ++---
src/mesa/main/enable.c | 1 -
src/mesa/main/mtypes.h | 1 -
src/mesa/main/state.c | 2 --
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 77629b9..418f0e2 100644
--- 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 fe15716..22a75c8 100644
--- 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 3d77fba..0463689 100644
--- 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 01059fa..f724864 100644
--- 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;
--
1.7.3.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
