diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-02-07 03:30:07 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-02-07 03:30:07 +0000 |
| commit | 03d967abb59c2e720e1936cbc76ef37622616cd1 (patch) | |
| tree | 9ecf33dcc2d3c2ce8b5fd275ce6d9e0a7b98572e /src/mesa/drivers/glide/fxdd.c | |
| parent | 6628bc9cff74a6d524165e809f73eabc85ba34b5 (diff) | |
new texture image routines work now
Diffstat (limited to 'src/mesa/drivers/glide/fxdd.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxdd.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c index d6ba79b22b..eea8e328f3 100644 --- a/src/mesa/drivers/glide/fxdd.c +++ b/src/mesa/drivers/glide/fxdd.c @@ -880,14 +880,11 @@ static GLboolean fxIsInHardware(GLcontext *ctx) } /* Unsupported texture/multitexture cases */ - if(fxMesa->emulateTwoTMUs) { - if((ctx->_Enabled & (TEXTURE0_3D | TEXTURE1_3D)) || - /* Not very well written ... */ - ((ctx->_Enabled & (TEXTURE0_1D | TEXTURE1_1D)) && - ((ctx->_Enabled & (TEXTURE0_2D | TEXTURE1_2D))!=(TEXTURE0_2D | TEXTURE1_2D))) - ) { - return GL_FALSE; - } + if (fxMesa->emulateTwoTMUs) { + if (ctx->Texture._ReallyEnabled & (TEXTURE0_3D | TEXTURE1_3D)) + return GL_FALSE; /* can't do 3D textures */ + if (ctx->Texture._ReallyEnabled & (TEXTURE0_1D | TEXTURE1_1D)) + return GL_FALSE; /* can't do 1D textures */ if (ctx->Texture._ReallyEnabled & TEXTURE0_2D) { if (ctx->Texture.Unit[0].EnvMode == GL_BLEND && |