From c1a3ab2a5bb210e50b57c480760fb4808c4f3b3b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 12 Jun 2012 10:31:50 +0000
Subject: [PATCH] Commented out the disabling of use of PBO's in ImageStream,
 and disabled the use ClientStoreHint in Present3D.

---
 src/osg/ImageStream.cpp                      |  4 ++--
 src/osgPresentation/SlideShowConstructor.cpp | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/osg/ImageStream.cpp b/src/osg/ImageStream.cpp
index 452af8d2c..cf3815d29 100644
--- a/src/osg/ImageStream.cpp
+++ b/src/osg/ImageStream.cpp
@@ -21,11 +21,11 @@ ImageStream::ImageStream():
 {
     setDataVariance(DYNAMIC);
 
-#ifndef __APPLE__
+//#ifndef __APPLE__
     // disabled under OSX for time being while we resolve why PBO
     // doesn't function properly under OSX.
     setPixelBufferObject(new PixelBufferObject(this));
-#endif
+//#endif
 
 }
 
diff --git a/src/osgPresentation/SlideShowConstructor.cpp b/src/osgPresentation/SlideShowConstructor.cpp
index af510a697..a488637b1 100644
--- a/src/osgPresentation/SlideShowConstructor.cpp
+++ b/src/osgPresentation/SlideShowConstructor.cpp
@@ -58,6 +58,8 @@
 
 using namespace osgPresentation;
 
+#define USE_CLIENT_STORAGE_HINT 0
+
 class SetToTransparentBin : public osg::NodeVisitor
 {
 public:
@@ -431,8 +433,9 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
                 texture->setResizeNonPowerOfTwoHint(false);
                 texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
                 texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
+#if USE_CLIENT_STORAGE_HINT
                 texture->setClientStorageHint(true);
-
+#endif
                 backgroundStateSet->setTextureAttributeAndModes(0,
                             texture,
                             osg::StateAttribute::ON);
@@ -748,7 +751,9 @@ public:
                 texture->setResizeNonPowerOfTwoHint(false);
                 texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
                 texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
+#if USE_CLIENT_STORAGE_HINT
                 texture->setClientStorageHint(true);
+#endif          
             }
         }
     }
@@ -826,8 +831,9 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
         texture->setResizeNonPowerOfTwoHint(false);
         texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
         texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
+#if USE_CLIENT_STORAGE_HINT        
         texture->setClientStorageHint(true);
-
+#endif
         stateset->setTextureAttributeAndModes(0,
                     texture,
                     osg::StateAttribute::ON);
@@ -841,9 +847,10 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
         imageStream->pause();
 
         OSG_INFO<<"Reading video "<<imageStream->getFileName()<<std::endl;
-
+#if USE_CLIENT_STORAGE_HINT
         // make sure that OSX uses the client storage extension to accelerate peformance where possible.
         texture->setClientStorageHint(true);
+#endif  
     }