---
src/mesa/main/debug.c | 3 +--
src/mesa/main/enable.c | 1 -
src/mesa/main/mtypes.h | 1 -
src/mesa/main/state.c | 2 --
4 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index aee8ae2..4f3d3f6 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -100,7 +100,7 @@ void
_mesa_print_tri_caps( const char *name, GLuint flags )
{
_mesa_debug(NULL,
- "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s\n",
+ "%s: (0x%x) %s%s%s%s%s%s%s%s%s\n",
name,
flags,
(flags & DD_SEPARATE_SPECULAR) ? "separate-specular, " : "",
@@ -109,7 +109,6 @@ _mesa_print_tri_caps( const char *name, GLuint flags )
(flags & DD_TRI_STIPPLE) ? "tri-stipple, " : "",
(flags & DD_TRI_OFFSET) ? "tri-offset, " : "",
(flags & DD_TRI_SMOOTH) ? "tri-smooth, " : "",
- (flags & DD_LINE_SMOOTH) ? "line-smooth, " : "",
(flags & DD_LINE_STIPPLE) ? "line-stipple, " : "",
(flags & DD_POINT_SMOOTH) ? "point-smooth, " : "",
(flags & DD_POINT_ATTEN) ? "point-atten, " : ""
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index b688f05..5c36e05 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -431,7 +431,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap,
GLboolean state)
return;
FLUSH_VERTICES(ctx, _NEW_LINE);
ctx->Line.SmoothFlag = state;
- ctx->_TriangleCaps ^= DD_LINE_SMOOTH;
break;
case GL_LINE_STIPPLE:
if (ctx->API != API_OPENGL_COMPAT)
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e46fa39..c97f907 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3173,7 +3173,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_LINE_SMOOTH (1 << 6)
#define DD_LINE_STIPPLE (1 << 7)
#define DD_POINT_SMOOTH (1 << 8)
#define DD_POINT_ATTEN (1 << 9)
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 251c1ae..f33bf08 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -366,8 +366,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state)
* Lines
*/
if (1/*new_state & _NEW_LINE*/) {
- if (ctx->Line.SmoothFlag)
- ctx->_TriangleCaps |= DD_LINE_SMOOTH;
if (ctx->Line.StippleFlag)
ctx->_TriangleCaps |= DD_LINE_STIPPLE;
}
--
1.7.3.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
