diff options
| author | Brian Paul <[email protected]> | 2000-09-28 22:44:30 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-09-28 22:44:30 +0000 |
| commit | eb6c6439ae23e47b79b72f3737b6d0d14e1f9f26 (patch) | |
| tree | 186e670bf1fac283352770d96e27576ff1c8d074 /src/mesa/drivers/x11 | |
| parent | 37a6211795cfd0a4431bdb7c676acf54f29df994 (diff) | |
removed ctx->Texture.Enabled, use ctx->Texture.ReallyEnabled instead
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/xm_line.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xm_tri.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c index 03af57b3bff..7a519482125 100644 --- a/src/mesa/drivers/x11/xm_line.c +++ b/src/mesa/drivers/x11/xm_line.c @@ -1,4 +1,4 @@ -/* $Id: xm_line.c,v 1.3 2000/09/26 20:54:13 brianp Exp $ */ +/* $Id: xm_line.c,v 1.4 2000/09/28 22:44:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -98,7 +98,7 @@ points_func xmesa_get_points_func( GLcontext *ctx ) XMesaContext xmesa = (XMesaContext) ctx->DriverCtx; if (ctx->Point.Size==1.0F && !ctx->Point.SmoothFlag && ctx->RasterMask==0 - && !ctx->Texture.Enabled) { + && !ctx->Texture.ReallyEnabled) { if (xmesa->xm_buffer->buffer==XIMAGE) { return (points_func) NULL; /*draw_points_ximage;*/ } @@ -674,7 +674,7 @@ line_func xmesa_get_line_func( GLcontext *ctx ) (void) kernel1; /* silence unused var warning */ if (ctx->Line.SmoothFlag) return (line_func)NULL; - if (ctx->Texture.Enabled) return (line_func)NULL; + if (ctx->Texture.ReallyEnabled) return (line_func)NULL; if (ctx->Light.ShadeModel!=GL_FLAT) return (line_func)NULL; /* X line stippling doesn't match OpenGL stippling */ if (ctx->Line.StippleFlag==GL_TRUE) return (line_func)NULL; diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c index 29b97a03b0d..5392c0f3532 100644 --- a/src/mesa/drivers/x11/xm_tri.c +++ b/src/mesa/drivers/x11/xm_tri.c @@ -1,4 +1,4 @@ -/* $Id: xm_tri.c,v 1.3 2000/09/26 20:54:13 brianp Exp $ */ +/* $Id: xm_tri.c,v 1.4 2000/09/28 22:44:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1541,7 +1541,7 @@ triangle_func xmesa_get_triangle_func( GLcontext *ctx ) (void) kernel1; if (ctx->Polygon.SmoothFlag) return (triangle_func)NULL; - if (ctx->Texture.Enabled) return (triangle_func)NULL; + if (ctx->Texture.ReallyEnabled) return (triangle_func)NULL; if (xmesa->xm_buffer->buffer==XIMAGE) { if ( ctx->Light.ShadeModel==GL_SMOOTH |