summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-09-28 13:58:28 -0700
committerIan Romanick <[email protected]>2010-10-01 15:49:13 -0700
commit214a33f6104511bc163fdb964161d264e67090d3 (patch)
treea32a114a3d0c3c9dd327586aeb2d376af3155255
parentcd5dea640144b45ba2e88c2451f1f01ee08c1c4a (diff)
ARB_texture_rg: Handle RED and RG the same as RGB for tex env
-rw-r--r--src/mesa/main/texstate.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index dae173d1bde..30c978c1cdd 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -179,6 +179,8 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
break;
case GL_LUMINANCE:
+ case GL_RED:
+ case GL_RG:
case GL_RGB:
case GL_YCBCR_MESA:
case GL_DUDV_ATI:
@@ -219,6 +221,8 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
case GL_INTENSITY:
state->SourceRGB[0] = GL_PREVIOUS;
break;
+ case GL_RED:
+ case GL_RG:
case GL_RGB:
case GL_YCBCR_MESA:
case GL_DUDV_ATI:
@@ -244,6 +248,8 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
state->OperandA[2] = GL_SRC_ALPHA;
/* FALLTHROUGH */
case GL_LUMINANCE:
+ case GL_RED:
+ case GL_RG:
case GL_RGB:
case GL_LUMINANCE_ALPHA:
case GL_RGBA: