Merge pull request #289 from eligovision/OpenSceneGraph-3.4_apple

IMAGEIO plugin tweak
2017-07-31 15:06:57 +01:00
parent 76a92314cf 60eb458c47
commit c1585d3c17
2 changed files with 199 additions and 158 deletions
--- a/include/osg/GLDefines
+++ b/include/osg/GLDefines
@@ -45,8 +45,10 @@
 typedef char GLchar;
 #endif

-#if !defined(GL_VERSION_2_0)
+#ifndef GL_VERTEX_PROGRAM_POINT_SIZE
    #define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#endif
+#ifndef GL_VERTEX_PROGRAM_TWO_SIDE
    #define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
 #endif