summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/glide/fxdd.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-05-04 16:15:33 +0000
committerBrian Paul <[email protected]>2000-05-04 16:15:33 +0000
commit9f0289dfac0c28feee4901eb72903fa4108624d1 (patch)
tree88b785c5f28d81c516e56a87beb31cef2ca78c22 /src/mesa/drivers/glide/fxdd.c
parenta14d28c2bd0e41e9153dc1ae13bdb2451191aafc (diff)
EnvMode GL_BLEND and tex invalidate changes from Daryll
Diffstat (limited to 'src/mesa/drivers/glide/fxdd.c')
-rw-r--r--src/mesa/drivers/glide/fxdd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 4f179a789d6..d37943f0c22 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -966,8 +966,14 @@ static GLboolean fxIsInHardware(GLcontext *ctx)
}
if (ctx->Texture.ReallyEnabled & TEXTURE0_2D) {
- if (ctx->Texture.Unit[0].EnvMode == GL_BLEND)
+ if (ctx->Texture.Unit[0].EnvMode == GL_BLEND &&
+ (ctx->Texture.ReallyEnabled & TEXTURE1_2D ||
+ ctx->Texture.Unit[0].EnvColor[0] != 0 ||
+ ctx->Texture.Unit[0].EnvColor[1] != 0 ||
+ ctx->Texture.Unit[0].EnvColor[2] != 0 ||
+ ctx->Texture.Unit[0].EnvColor[3] != 1)) {
return GL_FALSE;
+ }
if (ctx->Texture.Unit[0].Current->Image[0]->Border > 0)
return GL_FALSE;
}