commit bcfe3936a8722f43639ad853649c7f0ea8591cf3
author Brian Paul <brian.paul@tungstengraphics.com> Tue Apr 17 21:25:53 2001 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Tue Apr 17 21:25:53 2001 +0000
tree 209385bdbc9277c6b72f5905e77b278ee3f0ab53
parent 15eddf38fb2418f2e9703569e66e9f94a614e405

Fixed a number of minor GL_ARB_texture_env_combine/dot3 issues.

src/mesa/main/attrib.c

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index e856dc1..0acb2a9 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,4 +1,4 @@
-/* $Id: attrib.c,v 1.48 2001/04/11 23:22:20 brianp Exp $ */
+/* $Id: attrib.c,v 1.49 2001/04/17 21:25:53 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -602,7 +602,8 @@
          _mesa_TexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT,
                        GL_TEXTURE_LOD_BIAS_EXT, unit->LodBias);
       }
-      if (ctx->Extensions.EXT_texture_env_combine) {
+      if (ctx->Extensions.EXT_texture_env_combine ||
+          ctx->Extensions.ARB_texture_env_combine) {
          _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT,
                        unit->CombineModeRGB);
          _mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_EXT,