Changeset 10600 for OpenSceneGraph/trunk/src/osg/TextureRectangle.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/TextureRectangle.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -291 +291 @@
     }
 
-    unsigned char* dataMinusOffset = 0;
-    unsigned char* dataPlusOffset = 0;
-
-    const PixelBufferObject* pbo = image->getPixelBufferObject();
-    if (pbo && pbo->isPBOSupported(contextID))
+    const unsigned char* dataPtr = image->data();
+    GLBufferObject* pbo = image->getOrCreateGLBufferObject(contextID);
+    if (pbo)
     {
         state.bindPixelBufferObject(pbo);
-        dataMinusOffset = image->data();
-        dataPlusOffset = reinterpret_cast<unsigned char*>(pbo->offset());
-    }
-    else
-    {
-        pbo = 0;
+        dataPtr = reinterpret_cast<unsigned char*>(pbo->getOffset(image->getBufferIndex()));
     }
 
@@ -311 +304 @@
           image->s(), image->t(), 0,
           image->getImageSizeInBytes(), 
-          image->data() - dataMinusOffset + dataPlusOffset);                
+          dataPtr);
     }
     else
@@ -319 +312 @@
           (GLenum)image->getPixelFormat(),
           (GLenum)image->getDataType(),
-          image->data() - dataMinusOffset + dataPlusOffset );
+          dataPtr );
     }
     
@@ -366 +359 @@
 #ifdef DO_TIMING
     osg::Timer_t start_tick = osg::Timer::instance()->tick();
-    osg::notify(osg::NOTICE)<<"glTexSubImage2D pixelFormat = "<<std::hex<<image->getPixelFormat()<<std::dec<<std::endl;
+    osg::notify(osg::NOTICE)<<"TextureRectangle::apply pixelFormat = "<<std::hex<<image->getPixelFormat()<<std::dec<<std::endl;
 #endif
-    unsigned char* dataMinusOffset = 0;
-    unsigned char* dataPlusOffset = 0;
-
-    const PixelBufferObject* pbo = image->getPixelBufferObject();
-    if (pbo && pbo->isPBOSupported(contextID))
+    const unsigned char* dataPtr = image->data();
+    GLBufferObject* pbo = image->getOrCreateGLBufferObject(contextID);
+    if (pbo)
     {
         state.bindPixelBufferObject(pbo);
-        dataMinusOffset = image->data();
-        dataPlusOffset = reinterpret_cast<unsigned char*>(pbo->offset()); // -dataMinusOffset+dataPlusOffset
-
+        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;
 #endif
-
     }
     else
     {
-        pbo = 0;
+        osg::notify(osg::NOTICE)<<"    no PixelBufferObject "<<image->getBufferObject()<<", "<<image->getPixelBufferObject()<<" pbo="<<pbo<<std::endl;
     }
     
@@ -396 +384 @@
           (GLenum)image->getPixelFormat(),
           (GLenum)image->getDataType(),
-          image->data() - dataMinusOffset + dataPlusOffset);                
+          dataPtr);
     }
     else
@@ -405 +393 @@
           (GLenum)image->getPixelFormat(),
           (GLenum)image->getDataType(),
-          image->data() - dataMinusOffset + dataPlusOffset  );
+          dataPtr);
     }
 
@@ -416 +404 @@
     osg::notify(osg::NOTICE)<<"glTexSubImage2D "<<osg::Timer::instance()->delta_m(start_tick,osg::Timer::instance()->tick())<<"ms"<<std::endl;
 #endif
-    
 }