Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in

2017-03-15 01:35:58 +00:00
parent 6670a6e070
commit 76fe572934
24 changed files with 80 additions and 65 deletions
--- a/src/osg/PolygonMode.cpp
+++ b/src/osg/PolygonMode.cpp
@@ -68,7 +68,7 @@ PolygonMode::Mode PolygonMode::getMode(Face face) const

 void PolygonMode::apply(State&) const
 {
-#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE)
    if (_modeFront==_modeBack)
    {
        glPolygonMode(GL_FRONT_AND_BACK,(GLenum)_modeFront);