Restructed the marco to resolve Windows build issues

2017-03-25 16:05:57 +00:00
parent 1beddd3d29
commit ec5cbe18d5
2 changed files with 3 additions and 5 deletions
--- a/src/osg/StateSet.cpp
+++ b/src/osg/StateSet.cpp
@@ -40,9 +40,8 @@
 using namespace osg;


-#define FIXED_FUNCTION defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
 #define SHADERS_GL3 (defined(OSG_GL3_AVAILABLE) || defined(OSG_GLES3_AVAILABLE))
-#define SHADERS_GL2 !FIXED_FUNCTION && !SHADERS_GL3
+#define SHADERS_GL2 (!defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) && !defined(OSG_GL3_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE))
 #define IS_ES (defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE))

 #if SHADERS_GL3