OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paltex demo from recent texcombine changes. Minor clean-ups

Browse Source
This commit is contained in:
Brian Paul
2004-02-28 19:33:03 +00:00
parent e2df3d01af
commit d14da2d5ae
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/mesa/main/texstate.c
View File

@@ -1,6 +1,6 @@
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 5.1 * Version: 6.1
* *
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
* *
@@ -176,19 +176,19 @@ _mesa_print_texunit_state( GLcontext *ctx, GLuint unit )
* \param state texture_env_combine state vector to be filled-in. * \param state texture_env_combine state vector to be filled-in.
* \param mode Classic texture environment mode (i.e., \c GL_REPLACE, * \param mode Classic texture environment mode (i.e., \c GL_REPLACE,
* \c GL_BLEND, \c GL_DECAL, etc.). * \c GL_BLEND, \c GL_DECAL, etc.).
* \param tex_base_format Base format of the texture associated with the * \param texBaseFormat Base format of the texture associated with the
* texture unit. * texture unit.
*/ */
static void static void
calculate_derived_texenv( struct gl_tex_env_combine_state * state, calculate_derived_texenv( struct gl_tex_env_combine_state *state,
GLenum mode, GLenum tex_base_format ) GLenum mode, GLenum texBaseFormat )
{ {
GLenum mode_rgb; GLenum mode_rgb;
GLenum mode_a; GLenum mode_a;
*state = default_combine_state; *state = default_combine_state;
switch( tex_base_format ) { switch (texBaseFormat) {
case GL_ALPHA: case GL_ALPHA:
state->SourceRGB[0] = GL_PREVIOUS; state->SourceRGB[0] = GL_PREVIOUS;
break; break;
@@ -205,18 +205,14 @@ calculate_derived_texenv( struct gl_tex_env_combine_state * state,
break; break;
default: default:
state->SourceRGB[0] = GL_PREVIOUS; _mesa_problem(NULL, "Invalid texBaseFormat in calculate_derived_texenv");
state->SourceA[0] = GL_PREVIOUS;
state->ModeRGB = GL_REPLACE;
state->ModeA = GL_REPLACE;
ASSERT(0);
return; return;
} }
switch( mode ) { switch (mode) {
case GL_REPLACE: case GL_REPLACE:
case GL_MODULATE: case GL_MODULATE:
mode_rgb = (tex_base_format == GL_ALPHA) ? GL_REPLACE : mode; mode_rgb = (texBaseFormat == GL_ALPHA) ? GL_REPLACE : mode;
mode_a = mode; mode_a = mode;
break; break;
@@ -230,7 +226,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state * state,
* incoming fragment color matches the definition in NV_texture_shader. * incoming fragment color matches the definition in NV_texture_shader.
* The 1.5 spec simply marks these as "undefined". * The 1.5 spec simply marks these as "undefined".
*/ */
switch( tex_base_format ) { switch (texBaseFormat) {
case GL_ALPHA: case GL_ALPHA:
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_LUMINANCE_ALPHA: case GL_LUMINANCE_ALPHA:
@@ -251,7 +247,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state * state,
mode_rgb = GL_INTERPOLATE; mode_rgb = GL_INTERPOLATE;
mode_a = GL_MODULATE; mode_a = GL_MODULATE;
switch( tex_base_format ) { switch (texBaseFormat) {
case GL_ALPHA: case GL_ALPHA:
mode_rgb = GL_REPLACE; mode_rgb = GL_REPLACE;
break; break;
@@ -272,15 +268,14 @@ calculate_derived_texenv( struct gl_tex_env_combine_state * state,
break; break;
case GL_ADD: case GL_ADD:
mode_rgb = (tex_base_format == GL_ALPHA) ? GL_REPLACE : GL_ADD; mode_rgb = (texBaseFormat == GL_ALPHA) ? GL_REPLACE : GL_ADD;
mode_a = (tex_base_format == GL_INTENSITY) ? GL_ADD : GL_MODULATE; mode_a = (texBaseFormat == GL_INTENSITY) ? GL_ADD : GL_MODULATE;
break; break;
default: default:
mode_rgb = GL_REPLACE; _mesa_problem(NULL,
mode_a = GL_REPLACE; "Invalid texture env mode in calculate_derived_texenv");
ASSERT(0); return;
break;
} }
state->ModeRGB = (state->SourceRGB[0] != GL_PREVIOUS) state->ModeRGB = (state->SourceRGB[0] != GL_PREVIOUS)
@@ -289,6 +284,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state * state,
? mode_a : GL_REPLACE; ? mode_a : GL_REPLACE;
} }
void GLAPIENTRY void GLAPIENTRY
_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param ) _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
{ {
@@ -2954,9 +2950,11 @@ update_texture_state( GLcontext *ctx )
texUnit->_CurrentCombine = & texUnit->Combine; texUnit->_CurrentCombine = & texUnit->Combine;
} }
else { else {
calculate_derived_texenv( & texUnit->_EnvMode, GLenum format = texUnit->_Current->Image[0][0]->Format;
texUnit->EnvMode, if (format == GL_COLOR_INDEX) {
texUnit->_Current->Image[0][0]->Format ); format = GL_RGBA; /* a bit of a hack */
}
calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format);
texUnit->_CurrentCombine = & texUnit->_EnvMode; texUnit->_CurrentCombine = & texUnit->_EnvMode;
} }
@@ -2982,8 +2980,8 @@ update_texture_state( GLcontext *ctx )
break; break;
default: default:
texUnit->_CurrentCombine->_NumArgsRGB = 0; texUnit->_CurrentCombine->_NumArgsRGB = 0;
ASSERT(0); _mesa_problem(ctx, "invalid RGB combine mode in update_texture_state");
break; return;
} }
switch (texUnit->_CurrentCombine->ModeA) { switch (texUnit->_CurrentCombine->ModeA) {
@@ -3004,7 +3002,7 @@ update_texture_state( GLcontext *ctx )
break; break;
default: default:
texUnit->_CurrentCombine->_NumArgsA = 0; texUnit->_CurrentCombine->_NumArgsA = 0;
ASSERT(0); _mesa_problem(ctx, "invalid Alpha combine mode in update_texture_state");
break; break;
} }