diff options
author | Brian Paul <[email protected]> | 2000-11-19 23:10:25 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2000-11-19 23:10:25 +0000 |
commit | a852378a6289d154364dde440f89a39bbfc33e2d (patch) | |
tree | dbaf6946d80e517a2f0b349a11d1736cde1b83e1 /src/mesa/drivers/glide | |
parent | b12d8e3b0ddf6dc56dc866530b66230bdc5d73db (diff) |
Replaced Texture.CurrentD[] with separate Texture.Current1/2/3D vars.
Completely removed the dirty texture object list. Set texObj->Complete
to GL_FALSE to indicate dirty.
Made point/line/triangle/quad SWvertex parameters const.
Minor code clean-ups.
Diffstat (limited to 'src/mesa/drivers/glide')
-rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/glide/fxsetup.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 9f978b3f460..85d2271b72e 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -462,7 +462,7 @@ void fxDDTexUseGlbPalette(GLcontext *ctx, GLboolean state) else { fxMesa->haveGlobalPaletteTexture = 0; - if ((ctx->Texture.Unit[0]._Current == ctx->Texture.Unit[0].CurrentD[2]) && + if ((ctx->Texture.Unit[0]._Current == ctx->Texture.Unit[0].Current2D) && (ctx->Texture.Unit[0]._Current != NULL)) { struct gl_texture_object *tObj = ctx->Texture.Unit[0]._Current; diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c index 2cc6add1d28..a5af36ca41d 100644 --- a/src/mesa/drivers/glide/fxsetup.c +++ b/src/mesa/drivers/glide/fxsetup.c @@ -456,7 +456,7 @@ static void fxSetupTextureSingleTMU_NoLock(GLcontext *ctx, GLuint textureset) GLuint unitsmode; GLint ifmt; tfxTexInfo *ti; - struct gl_texture_object *tObj=ctx->Texture.Unit[textureset].CurrentD[2]; + struct gl_texture_object *tObj=ctx->Texture.Unit[textureset].Current2D; int tmu; if (MESA_VERBOSE&VERBOSE_DRIVER) { @@ -747,8 +747,8 @@ static void fxSetupTextureDoubleTMU_NoLock(GLcontext *ctx) fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx; GrCombineLocal_t localc,locala; tfxTexInfo *ti0,*ti1; - struct gl_texture_object *tObj0=ctx->Texture.Unit[0].CurrentD[2]; - struct gl_texture_object *tObj1=ctx->Texture.Unit[1].CurrentD[2]; + struct gl_texture_object *tObj0=ctx->Texture.Unit[0].Current2D; + struct gl_texture_object *tObj1=ctx->Texture.Unit[1].Current2D; GLuint envmode,ifmt,unitsmode; int tmu0=0, tmu1=1; |