From b5a5cd7901b67f7ee78d2f753c8921c710094880 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 24 Nov 2005 10:28:09 +0000
Subject: [PATCH] Changed the default value of
 Texture::_resizeNonPowerOfTwoHint to true, to improve the backwards
 compatibility of peformance on systems that have OpenGL2.0 drivers but
 without hardware that can't handle non power of two textures.

---
 examples/osgshaderterrain/osgshaderterrain.cpp | 4 +++-
 src/osg/Texture.cpp                            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/osgshaderterrain/osgshaderterrain.cpp b/examples/osgshaderterrain/osgshaderterrain.cpp
index 8aa2227b6..d63fe9f6d 100644
--- a/examples/osgshaderterrain/osgshaderterrain.cpp
+++ b/examples/osgshaderterrain/osgshaderterrain.cpp
@@ -533,7 +533,7 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int /*numTreesToCreates*
     terrainTexture->setImage(terrainImage);
     terrainTexture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::NEAREST);
     terrainTexture->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
-    //terrainTexture->setResizeNonPowerOfTwoHint(true);
+    terrainTexture->setResizeNonPowerOfTwoHint(false);
     stateset->setTextureAttributeAndModes(0,terrainTexture,osg::StateAttribute::ON);
 
 
@@ -669,6 +669,7 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int /*numTreesToCreates*
     }
         
     std::cout<<"done."<<std::endl;
+    
 #if 0
     std::cout<<"Creating tree locations...";std::cout.flush();
     TreeList trees;
@@ -686,6 +687,7 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int /*numTreesToCreates*
     tex->setWrap( osg::Texture2D::WRAP_S, osg::Texture2D::CLAMP );
     tex->setWrap( osg::Texture2D::WRAP_T, osg::Texture2D::CLAMP );
     tex->setImage(osgDB::readImageFile("Images/tree0.rgba"));
+    tex->setResizeNonPowerOfTwoHint(false);
 
     osg::StateSet *dstate = new osg::StateSet;
     {    
diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp
index d62e406a2..df5345e69 100644
--- a/src/osg/Texture.cpp
+++ b/src/osg/Texture.cpp
@@ -340,7 +340,7 @@ Texture::Texture():
             _useHardwareMipMapGeneration(true),
             _unrefImageDataAfterApply(false),
             _clientStorageHint(false),
-            _resizeNonPowerOfTwoHint(false),
+            _resizeNonPowerOfTwoHint(true),
             _borderColor(0.0, 0.0, 0.0, 0.0),
             _borderWidth(0),
             _internalFormatMode(USE_IMAGE_DATA_FORMAT),