From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 28 Sep 2010 20:58:28 +0000 (-0700)
Subject: ARB_texture_rg: Handle RED and RG the same as RGB for tex env
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=214a33f6104511bc163fdb964161d264e67090d3;p=mesa.git

ARB_texture_rg: Handle RED and RG the same as RGB for tex env
---

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: