Ported osgUtil, osgDB, osgGA, NodeKits and plugins to compile against OpenGL ES 1.1 and OpenGL ES 2.0.

include/osg/FrameBufferObject

@@ -108,6 +108,10 @@
 #define GL_MULTISAMPLE_COVERAGE_MODES_NV        0x8E12
 #endif
 
+#ifndef GL_DEPTH_COMPONENT
+#define GL_DEPTH_COMPONENT              0x1902
+#endif
+
 #ifndef GL_VERSION_1_4
 #define GL_DEPTH_COMPONENT16              0x81A5
 #define GL_DEPTH_COMPONENT24              0x81A6

include/osg/PolygonOffset

@@ -16,6 +16,11 @@
 
 #include <osg/StateAttribute>
 
+#ifndef GL_POLYGON_OFFSET_LINE 
+    #define GL_POLYGON_OFFSET_LINE 0x2A02
+    #define GL_POLYGON_OFFSET_POINT 0x2A01
+#endif
+
 namespace osg {
 
 /** PolygonOffset - encapsulates the OpenGL glPolygonOffset state.*/

include/osg/Texture

@@ -145,8 +145,7 @@
 #endif
 
 #ifndef GL_CLAMP
-    // OpenGL ES1 and ES2 doesn't provide GL_CLAMP but has GL_CLAMP_TO_EDGE
-    #define GL_CLAMP GL_CLAMP_TO_EDGE
+    #define GL_CLAMP                          0x2900  
 #endif
 
 #ifndef GL_CLAMP_TO_BORDER_ARB

include/osgPresentation/SlideShowConstructor

@@ -391,7 +391,9 @@ protected:
     osg::StateSet* createTransformStateSet()
     {
         osg::StateSet* stateset = new osg::StateSet;
-        stateset->setMode(GL_NORMALIZE,osg::StateAttribute::ON);
+        #if !defined(OSG_GLES2_AVAILABLE)
+            stateset->setMode(GL_NORMALIZE,osg::StateAttribute::ON);
+        #endif
         return stateset;
     }
 

include/osgText/Font

@@ -311,8 +311,6 @@ public:
         
         void subload() const;
         
-        void draw(osg::State& state) const;
-
     protected:
 
         virtual ~Glyph();