From 08893c7fcc87665ba27fcd24d4f70721598551e6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 2 Jul 2015 08:52:55 +0000 Subject: [PATCH] Moved the defination of GL_MAX_VARYING_COMPONENTS to GL_3_0 block to avoid warnings of redefinition. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14933 16af8721-9629-0410-8352-f15c8da7e697 --- include/osg/GLDefines | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/osg/GLDefines b/include/osg/GLDefines index f9dc2dc7d..79f73a83d 100644 --- a/include/osg/GLDefines +++ b/include/osg/GLDefines @@ -188,6 +188,10 @@ typedef char GLchar; #define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D #endif +#ifndef GL_VERSION_3_0 +#define GL_MAX_VARYING_COMPONENTS 0x8B4B +#endif + #ifndef GL_VERSION_3_2 #define GL_GEOMETRY_SHADER 0x8DD9 #define GL_GEOMETRY_VERTICES_OUT 0x8916 @@ -196,7 +200,6 @@ typedef char GLchar; #define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 #define GL_MAX_GEOMETRY_VARYING_COMPONENTS 0x8DDD #define GL_MAX_VERTEX_VARYING_COMPONENTS 0x8DDE -#define GL_MAX_VARYING_COMPONENTS 0x8B4B #define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF #define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 #define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1