Mesa (master): ARB_texture_rg: Handle RED and RG the same as RGB for tex env

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 214a33f6104511bc163fdb964161d264e67090d3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=214a33f6104511bc163fdb964161d264e67090d3

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Sep 28 13:58:28 2010 -0700

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

---

 src/mesa/main/texstate.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index dae173d..30c978c 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: