Commits

Anonymous committed 496a9e8 Draft

Commented out the disabling of use of PBO's in ImageStream, and disabled the use ClientStoreHint in Present3D.

Comments (0)

Files changed (2)

src/osg/ImageStream.cpp

 {
     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
 
 }
 

src/osgPresentation/SlideShowConstructor.cpp

 
 using namespace osgPresentation;
 
+#define USE_CLIENT_STORAGE_HINT 0
+
 class SetToTransparentBin : public osg::NodeVisitor
 {
 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
                 backgroundStateSet->setTextureAttributeAndModes(0,
                             texture,
                             osg::StateAttribute::ON);
                 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          
             }
         }
     }
         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);
         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  
     }