fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

In the last commit I added in a fatal error on unknown base formats so I

Browse source 
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.
This commit is contained in:
Eric Anholt 2005-10-24 22:23:52 +00:00
parent f33beed330
commit 7040b7ad88
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/drivers/dri/sis/sis_texstate.c
View file

@ -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);
}