Index: OpenSceneGraph/trunk/include/osg/State
===================================================================
--- OpenSceneGraph/trunk/include/osg/State (revision 10600)
+++ OpenSceneGraph/trunk/include/osg/State (revision 10601)
@@ -412,5 +412,5 @@
             if (vbo == _currentVBO) return;
             if (vbo->isDirty()) vbo->compileBuffer();
-            else _glBindBuffer(GL_ARRAY_BUFFER_ARB,vbo->getGLObjectID());
+            else vbo->bindBuffer();
             _currentVBO = vbo;
         }
@@ -430,5 +430,5 @@
             if (ebo == _currentEBO) return;
             if (ebo->isDirty()) ebo->compileBuffer();
-            else _glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,ebo->getGLObjectID());
+            else ebo->bindBuffer();
             _currentEBO = ebo;
         }
@@ -449,5 +449,5 @@
 
             if (pbo->isDirty()) pbo->compileBuffer();
-            else _glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB,pbo->getGLObjectID());
+            else pbo->bindBuffer();
 
             _currentPBO = pbo;
@@ -1041,10 +1041,6 @@
         unsigned int getMaxTexturePoolSize() const { return _maxTexturePoolSize; }
 
-        void setMaxVBOPoolSize(unsigned int size);
-        unsigned int getMaxVBOPoolSize() const { return _maxVBOPoolSize; }
-
-        void setMaxFBOPoolSize(unsigned int size);
-        unsigned int getMaxFBOPoolSize() const { return _maxFBOPoolSize; }
-
+        void setMaxBufferObjectPoolSize(unsigned int size);
+        unsigned int getMaxBufferObjectPoolSize() const { return _maxBufferObjectPoolSize; }
 
 
@@ -1234,6 +1230,5 @@
 
         unsigned int                                                    _maxTexturePoolSize;
-        unsigned int                                                    _maxVBOPoolSize;
-        unsigned int                                                    _maxFBOPoolSize;
+        unsigned int                                                    _maxBufferObjectPoolSize;