summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2005-10-24 22:23:52 +0000
committerEric Anholt <anholt@FreeBSD.org>2005-10-24 22:23:52 +0000
commit7040b7ad88b5f8ced609340f48ad6de1b1abc9cc (patch)
tree045222cdcfdb5554d734e841feee8aeaf33ccb0f /src/mesa/drivers/dri
parentf33beed330c22b56bb97af73f56d83c34e985cb6 (diff)
In the last commit I added in a fatal error on unknown base formats so I
wouldn't get confused when adding support for new formats. However, it resulted in dying in texenv instead of drawing something undefined for GL_DECAL. Do what GLcore apparently does and just pass the fragment through.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/sis/sis_texstate.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_texstate.c b/src/mesa/drivers/dri/sis/sis_texstate.c
index b9942174fe..7ef20f880c 100644
--- a/src/mesa/drivers/dri/sis/sis_texstate.c
+++ b/src/mesa/drivers/dri/sis/sis_texstate.c
@@ -124,6 +124,13 @@ sis_set_texture_env0( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor0 = STAGE0_C_CFOMAS_CSAS;
current->hwTexBlendAlpha0 = STAGE0_A_AF;
break;
+ case GL_ALPHA:
+ case GL_LUMINANCE:
+ case GL_INTENSITY:
+ case GL_LUMINANCE_ALPHA:
+ current->hwTexBlendColor0 = STAGE0_C_CF;
+ current->hwTexBlendAlpha0 = STAGE0_A_AF;
+ break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
}
@@ -253,6 +260,13 @@ sis_set_texture_env1( GLcontext *ctx, struct gl_texture_object *texObj,
current->hwTexBlendColor1 = STAGE1_C_CFOMAS_CSAS;
current->hwTexBlendAlpha1 = STAGE1_A_AF;
break;
+ case GL_ALPHA:
+ case GL_LUMINANCE:
+ case GL_INTENSITY:
+ case GL_LUMINANCE_ALPHA:
+ current->hwTexBlendColor1 = STAGE1_C_CF;
+ current->hwTexBlendAlpha1 = STAGE1_A_AF;
+ break;
default:
sis_fatal_error("unknown base format 0x%x\n", t->format);
}