From 5a3f8fc8a630351367eb0f4f5c3e694c38e406df Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 26 Aug 2002 15:02:31 +0000
Subject: [PATCH] Moved the #define GL_DOT3_RGB_ARB's into their own #ifndef
 GL_ARB_texture_env_dot3 block.

---
 include/osg/TexEnvCombine | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/osg/TexEnvCombine b/include/osg/TexEnvCombine
index 80bfa03ba..2cf155999 100644
--- a/include/osg/TexEnvCombine
+++ b/include/osg/TexEnvCombine
@@ -12,12 +12,9 @@
 // if not defined by gl.h use the definition found in:
 // http://oss.sgi.com/projects/ogl-sample/registry/ARB/texture_env_combine.txt
 #ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
 #define GL_COMBINE_ARB                                     0x8570
 #define GL_COMBINE_RGB_ARB                                 0x8571
 #define GL_COMBINE_ALPHA_ARB                               0x8572
-#define GL_DOT3_RGB_ARB                                    0x86AE
-#define GL_DOT3_RGBA_ARB                                   0x86AF
 #define GL_SOURCE0_RGB_ARB                                 0x8580
 #define GL_SOURCE1_RGB_ARB                                 0x8581
 #define GL_SOURCE2_RGB_ARB                                 0x8582
@@ -39,6 +36,11 @@
 #define GL_PREVIOUS_ARB                                    0x8578
 #endif
 
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB                                    0x86AE
+#define GL_DOT3_RGBA_ARB                                   0x86AF
+#endif
+
 #ifndef GL_TEXTURE0
 #define GL_TEXTURE0 0x84C0
 #endif