From 5ad1a652a003718f71e10d34e691b971f00c82cc Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 15 Jan 2018 16:02:44 +0000
Subject: [PATCH] Moved defined into GLDefines header to avoid compile issues
 under Windows

---
 include/osg/GLDefines | 13 +++++++++++++
 src/osg/Sampler.cpp   | 11 -----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/include/osg/GLDefines b/include/osg/GLDefines
index ce32acf6c..7fa782c1a 100644
--- a/include/osg/GLDefines
+++ b/include/osg/GLDefines
@@ -646,6 +646,19 @@ typedef char GLchar;
     #define GL_MAX_3D_TEXTURE_SIZE      0x8073
 #endif
 
+#ifndef GL_TEXTURE_MIN_LOD
+    #define GL_TEXTURE_MIN_LOD          0x813A
+#endif
+
+#ifndef GL_TEXTURE_MAX_LOD
+    #define GL_TEXTURE_MAX_LOD          0x813B
+#endif
+
+#ifndef GL_TEXTURE_LOD_BIAS
+    #define GL_TEXTURE_LOD_BIAS         0x8501
+#endif
+
+
 #ifndef GL_INTERLEAVED_ATTRIBS
     #define GL_INTERLEAVED_ATTRIBS      0x8C8C
 #endif
diff --git a/src/osg/Sampler.cpp b/src/osg/Sampler.cpp
index c5597acd8..86aafb88d 100644
--- a/src/osg/Sampler.cpp
+++ b/src/osg/Sampler.cpp
@@ -15,13 +15,6 @@
 #include <osg/Sampler>
 #include <osg/Texture3D>
 
-#ifndef GL_TEXTURE_MIN_LOD
-#define GL_TEXTURE_MIN_LOD 0x813A
-#endif
-
-#ifndef GL_TEXTURE_MAX_LOD
-#define GL_TEXTURE_MAX_LOD 0x813B
-#endif
 
 #ifndef GL_TEXTURE_WRAP_R
 #define GL_TEXTURE_WRAP_R 0x2804
@@ -35,10 +28,6 @@
 #define GL_TEXTURE_COMPARE_FUNC 0x884D
 #endif
 
-#ifndef GL_TEXTURE_LOD_BIAS
-#define GL_TEXTURE_LOD_BIAS 0x8501
-#endif
-
 
 using namespace osg;