Holger's fixes for GL_EXT_texture_env_combine

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 64df9016dc945caadaf5b048e8bc8235d3d3e87a..47cec1e4c5effaf7cce1c81d06a1a80720731a2c 100644 (file)
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,4 +1,4 @@
-/* $Id: texstate.c,v 1.14 2000/06/27 21:42:13 brianp Exp $ */
+/* $Id: texstate.c,v 1.15 2000/07/05 16:14:24 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -216,12 +216,9 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
                switch (operand) {
                   case GL_SRC_COLOR:
                   case GL_ONE_MINUS_SRC_COLOR:
-                     texUnit->CombineOperandRGB[s] = operand;
-                     ctx->NewState |= NEW_TEXTURE_ENV;
-                     break;
                   case GL_SRC_ALPHA:
                   case GL_ONE_MINUS_SRC_ALPHA:
-                     texUnit->CombineOperandA[s] = operand;
+                     texUnit->CombineOperandRGB[s] = operand;
                      ctx->NewState |= NEW_TEXTURE_ENV;
                      break;
                   default: