Changeset 10600 for OpenSceneGraph/trunk/src/osg/Texture.cpp

Timestamp:

10/01/09 22:19:42 (4 years ago)

Author:

robert

Message:

Introduced new BufferObject? design + implementation in preperation of implementing a pool system for buffer objects

Files:

• OpenSceneGraph/trunk/src/osg/Texture.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/src/osg/Texture.cpp

@@ -47 +47 @@
 #endif
 
-//#define DO_TIMING
+// #define DO_TIMING
 
 namespace osg {
@@ -1778 +1778 @@
     bool useGluBuildMipMaps = mipmappingRequired && (!useHardwareMipMapGeneration && !image->isMipmap());
 
-    unsigned char* dataMinusOffset = 0;
-    unsigned char* dataPlusOffset = 0;
-
-    const PixelBufferObject* pbo = image->getPixelBufferObject();
-    if (pbo && pbo->isPBOSupported(contextID) && !needImageRescale && !useGluBuildMipMaps)
+    const unsigned char* dataPtr = image->data();
+    GLBufferObject* pbo = image->getOrCreateGLBufferObject(contextID);
+    if (pbo && !needImageRescale && !useGluBuildMipMaps)
     {
         state.bindPixelBufferObject(pbo);
-        dataMinusOffset = data;
-        dataPlusOffset = reinterpret_cast<unsigned char*>(pbo->offset());
+        dataPtr = reinterpret_cast<const unsigned char*>(pbo->getOffset(image->getBufferIndex()));
 #ifdef DO_TIMING
         osg::notify(osg::NOTICE)<<"after PBO "<<osg::Timer::instance()->delta_m(start_tick,osg::Timer::instance()->tick())<<"ms"<<std::endl;
@@ -1809 +1806 @@
                 (GLenum)image->getPixelFormat(),
                 (GLenum)image->getDataType(),
-                data -dataMinusOffset+dataPlusOffset);
+                dataPtr);
 
         }
@@ -1822 +1819 @@
                 inwidth, inheight,0, 
                 size, 
-                data-dataMinusOffset+dataPlusOffset);                
+                dataPtr);
         }
 
@@ -1854 +1851 @@
                         (GLenum)image->getPixelFormat(),
                         (GLenum)image->getDataType(),
-                        image->getMipmapData(k)-dataMinusOffset+dataPlusOffset);
+                        dataPtr + image->getMipmapOffset(k));
 
                     width >>= 1;
@@ -1875 +1872 @@
                     extensions->glCompressedTexImage2D(target, k, _internalFormat, 
                                                        width, height, _borderWidth, 
-                                                       size, image->getMipmapData(k)-dataMinusOffset+dataPlusOffset);                
+                                                       size, dataPtr + image->getMipmapOffset(k));
 
                     width >>= 1;
@@ -2028 +2025 @@
     unsigned char* dataPlusOffset = 0;
     
-    const PixelBufferObject* pbo = image->getPixelBufferObject();
-    if (pbo && pbo->isPBOSupported(contextID) && !needImageRescale && !useGluBuildMipMaps)
+    const unsigned char* dataPtr = image->data();
+    GLBufferObject* pbo = image->getOrCreateGLBufferObject(contextID);
+    if (pbo && !needImageRescale && !useGluBuildMipMaps)
     {
         state.bindPixelBufferObject(pbo);
-        dataMinusOffset = data;
-        dataPlusOffset = reinterpret_cast<unsigned char*>(pbo->offset());
+        dataPtr = reinterpret_cast<unsigned char*>(pbo->getOffset(image->getBufferIndex()));
 #ifdef DO_TIMING
         osg::notify(osg::NOTICE)<<"after PBO "<<osg::Timer::instance()->delta_m(start_tick,osg::Timer::instance()->tick())<<"ms"<<std::endl;