Introduced usage of OSG_GLES*_AVAILABLE macros to headers and .cpp's to enable building against OpenGL ES 1.x and 2.x headers

2009-10-25 11:52:01 +00:00
parent 488d108ae0
commit 37ee16403a
37 changed files with 538 additions and 209 deletions
--- a/src/osg/ColorMatrix.cpp
+++ b/src/osg/ColorMatrix.cpp
@@ -28,7 +28,7 @@ ColorMatrix::~ColorMatrix()

 void ColorMatrix::apply(State& state) const
 {
-#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+#if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE) && !defined(OSG_GLES1_AVAILABLE)
    unsigned int contextID = state.getContextID();
    
    static bool s_ARB_imaging = isGLExtensionSupported(contextID,"GL_ARB_imaging");