From eb6c6439ae23e47b79b72f3737b6d0d14e1f9f26 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 28 Sep 2000 22:44:30 +0000 Subject: removed ctx->Texture.Enabled, use ctx->Texture.ReallyEnabled instead --- src/mesa/drivers/d3d/D3Dvbrender.c | 6 +++--- src/mesa/drivers/osmesa/osmesa.c | 6 +++--- src/mesa/drivers/windows/wmesa.c | 8 ++++---- src/mesa/drivers/windows/wmesa_stereo.c | 34 ++++++++++++++++----------------- src/mesa/drivers/x11/xm_line.c | 6 +++--- src/mesa/drivers/x11/xm_tri.c | 4 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/d3d/D3Dvbrender.c b/src/mesa/drivers/d3d/D3Dvbrender.c index 6ed8037902..0ef32e26ce 100644 --- a/src/mesa/drivers/d3d/D3Dvbrender.c +++ b/src/mesa/drivers/d3d/D3Dvbrender.c @@ -1511,7 +1511,7 @@ static void SetRenderStates( GLcontext *ctx ) /*================================================*/ /* Check too see if there are new TEXTURE states. */ /*================================================*/ - if ( ctx->Texture.Enabled ) + if ( ctx->Texture.ReallyEnabled ) { switch( ctx->Texture.Set[ctx->Texture.CurrentSet].EnvMode ) { @@ -1871,9 +1871,9 @@ static void DebugRenderStates( GLcontext *ctx, BOOL bForce ) /*================================================*/ /* Check too see if there are new TEXTURE states. */ /*================================================*/ - if ( texture != ctx->Texture.Enabled ) + if ( texture != ctx->Texture.ReallyEnabled ) { - texture = ctx->Texture.Enabled; + texture = ctx->Texture.ReallyEnabled; DPF(( 0, "\tTexture\t\t%s", (texture) ? "ENABLED" : "--------" )); } diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 11336e5cd9..55fe26181e 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -1,4 +1,4 @@ -/* $Id: osmesa.c,v 1.21 2000/09/26 20:54:12 brianp Exp $ */ +/* $Id: osmesa.c,v 1.22 2000/09/28 22:44:31 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1395,7 +1395,7 @@ static line_func choose_line_function( GLcontext *ctx ) OSMesaContext osmesa = (OSMesaContext) ctx; if (ctx->Line.SmoothFlag) return NULL; - if (ctx->Texture.Enabled) return NULL; + if (ctx->Texture.ReallyEnabled) return NULL; if (ctx->Light.ShadeModel!=GL_FLAT) return NULL; if (ctx->Line.Width==1.0F @@ -1581,7 +1581,7 @@ static triangle_func choose_triangle_function( GLcontext *ctx ) if (ctx->Polygon.SmoothFlag) return NULL; if (ctx->Polygon.StippleFlag) return NULL; - if (ctx->Texture.Enabled) return NULL; + if (ctx->Texture.ReallyEnabled) return NULL; if (ctx->RasterMask==DEPTH_BIT && ctx->Depth.Func==GL_LESS diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c index b372469288..6b2b02bc35 100644 --- a/src/mesa/drivers/windows/wmesa.c +++ b/src/mesa/drivers/windows/wmesa.c @@ -1,4 +1,4 @@ -/* $Id: wmesa.c,v 1.8 2000/09/26 20:54:13 brianp Exp $ */ +/* $Id: wmesa.c,v 1.9 2000/09/28 22:44:32 brianp Exp $ */ /* * Windows (Win32) device driver for Mesa 3.4 @@ -651,7 +651,7 @@ extern points_func choose_points_function( GLcontext* ctx ) { STARTPROFILE if (ctx->Point.Size==1.0 && !ctx->Point.SmoothFlag && ctx->RasterMask==0 - && !ctx->Texture.Enabled && ctx->Visual->RGBAflag) { + && !ctx->Texture.ReallyEnabled && ctx->Visual->RGBAflag) { ENDPROFILE(choose_points_function) return fast_rgb_points; } @@ -709,7 +709,7 @@ static line_func choose_line_function( GLcontext* ctx ) STARTPROFILE if (ctx->Line.Width==1.0 && !ctx->Line.SmoothFlag && !ctx->Line.StippleFlag && ctx->Light.ShadeModel==GL_FLAT && ctx->RasterMask==0 - && !ctx->Texture.Enabled && Current->rgb_flag) { + && !ctx->Texture.ReallyEnabled && Current->rgb_flag) { ENDPROFILE(choose_line_function) return fast_flat_rgb_line; } @@ -2851,7 +2851,7 @@ static triangle_func choose_triangle_function( GLcontext *ctx ) int depth = wmesa->cColorBits; if (ctx->Polygon.SmoothFlag) return NULL; - if (ctx->Texture.Enabled) return NULL; + if (ctx->Texture.ReallyEnabled) return NULL; if (!wmesa->db_flag) return NULL; /*if (wmesa->xm_buffer->buffer==XIMAGE)*/ { if ( ctx->Light.ShadeModel==GL_SMOOTH diff --git a/src/mesa/drivers/windows/wmesa_stereo.c b/src/mesa/drivers/windows/wmesa_stereo.c index 3408fe943c..70251ae877 100644 --- a/src/mesa/drivers/windows/wmesa_stereo.c +++ b/src/mesa/drivers/windows/wmesa_stereo.c @@ -420,7 +420,7 @@ extern points_func choose_points_function( GLcontext* ctx ) { STARTPROFILE if (ctx->Point.Size==1.0 && !ctx->Point.SmoothFlag && ctx->RasterMask==0 - && !ctx->Texture.Enabled && ctx->Visual->RGBAflag) { + && !ctx->Texture.ReallyEnabled && ctx->Visual->RGBAflag) { ENDPROFILE(choose_points_function) return fast_rgb_points; } @@ -478,7 +478,7 @@ static line_func choose_line_function( GLcontext* ctx ) STARTPROFILE if (ctx->Line.Width==1.0 && !ctx->Line.SmoothFlag && !ctx->Line.StippleFlag && ctx->Light.ShadeModel==GL_FLAT && ctx->RasterMask==0 - && !ctx->Texture.Enabled && Current->rgb_flag) { + && !ctx->Texture.ReallyEnabled && Current->rgb_flag) { ENDPROFILE(choose_line_function) return fast_flat_rgb_line; } @@ -589,7 +589,7 @@ static triangle_func choose_triangle_function( GLcontext *ctx ) { if (ctx->Polygon.SmoothFlag) return NULL; if (ctx->Polygon.StippleFlag) return NULL; - if (ctx->Texture.Enabled) return NULL; + if (ctx->Texture.ReallyEnabled) return NULL; if (ctx->RasterMask==DEPTH_BIT && ctx->Depth.Func==GL_LESS @@ -657,15 +657,15 @@ static void fast_flat_rgb_polygon( GLcontext* ctx, GLuint n, GLuint vlist[], GLu /* Return pointer to accerated polygon function */ static polygon_func choose_polygon_function( GLcontext* ctx ) { - STARTPROFILE + STARTPROFILE if (!ctx->Polygon.SmoothFlag && !ctx->Polygon.StippleFlag && ctx->Light.ShadeModel==GL_FLAT && ctx->RasterMask==0 - && !ctx->Texture.Enabled && Current->rgb_flag==GL_TRUE) { - ENDPROFILE(choose_polygon_function) + && !ctx->Texture.ReallyEnabled && Current->rgb_flag==GL_TRUE) { + ENDPROFILE(choose_polygon_function) return fast_flat_rgb_polygon; } else { - ENDPROFILE(choose_polygon_function) + ENDPROFILE(choose_polygon_function) return NULL; } } @@ -679,18 +679,18 @@ static polygon_func choose_polygon_function( GLcontext* ctx ) /* Write a horizontal span of color-index pixels with a boolean mask. */ static void write_index_span( GLcontext* ctx, - GLuint n, GLint x, GLint y, - const GLuint index[], + GLuint n, GLint x, GLint y, + const GLuint index[], const GLubyte mask[] ) { - STARTPROFILE - GLuint i; - char *Mem=Current->ScreenMem+y*Current->ScanWidth+x; - assert(Current->rgb_flag==GL_FALSE); - for (i=0; iScreenMem+y*Current->ScanWidth+x; + assert(Current->rgb_flag==GL_FALSE); + for (i=0; iDriverCtx; 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 29b97a03b0..5392c0f353 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 -- cgit v1.2.3