Changeset 10695 for OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

Timestamp:

10/27/09 20:17:38 (4 years ago)

Author:

robert

Message:

Fixed build aginst GLES1 and GLES2

Files:

• OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

@@ -2008 +2008 @@
             {
 
-                glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 1.0);
+                #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) 
+                    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_PRIORITY, 1.0);
+                #endif
 
                 // we have StateSet's to compile
@@ -2030 +2032 @@
                     (*itr)->compileGLObjects(state);
 
-                    GLint p;
-                    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_RESIDENT, &p);
+                    #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) 
+                        GLint p;
+                        glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_RESIDENT, &p);
+                    #endif
 
                     elapsedTime = timer.delta_s(start_tick,timer.tick());
-
 
                     // estimate the duration of the compile based on current compile duration.