Moved from svn/trunk, moved GL_ALPHA_TEST from AlphaFunc to GLDefines

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15004 16af8721-9629-0410-8352-f15c8da7e697
2015-07-22 14:30:01 +00:00
parent 8e20224828
commit 3d69d46e3e
2 changed files with 4 additions and 4 deletions
--- a/include/osg/AlphaFunc
+++ b/include/osg/AlphaFunc
@@ -16,10 +16,6 @@

 #include <osg/StateAttribute>

-#ifndef GL_ALPHA_TEST
-    #define GL_ALPHA_TEST 0x0BC0
-#endif
-
 namespace osg {

 /** Encapsulates OpenGL glAlphaFunc.
--- a/include/osg/GLDefines
+++ b/include/osg/GLDefines
@@ -600,6 +600,10 @@ typedef char GLchar;
 #define GL_RASTERIZER_DISCARD           0x8C89
 #endif

+#ifndef GL_ALPHA_TEST
+    #define GL_ALPHA_TEST 0x0BC0
+#endif
+
 namespace osg
 {
    #ifndef GL_VERSION_3_2