diff options
| author | Brian Paul <[email protected]> | 2000-07-05 16:14:24 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-07-05 16:14:24 +0000 |
| commit | 08b082ae1a7e718144615e4ed7f060f77c4aead7 (patch) | |
| tree | 10696df7f421e7a3d5d1930a2e40a2225bacf3ae /src/mesa | |
| parent | ae01d0837dfcd691c833cb372d6ed8e22b467428 (diff) | |
Holger's fixes for GL_EXT_texture_env_combine
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texstate.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 64df9016dc9..47cec1e4c5e 100644 --- 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: |