From 4ff8df73bc7a990049f2eb6a5040c5c430c37c0b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 26 Mar 2009 10:25:50 +0000 Subject: [PATCH] Merged fixes to the texture compression settings from svn/trunk that don't change the requested compression type when the pixel type is not a direct match. --- src/osg/Texture.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index ca82246f9..a7bdca26e 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -603,7 +603,7 @@ void Texture::computeInternalFormatWithImage(const osg::Image& image) const switch(image.getPixelFormat()) { case(3): - case(GL_RGB): internalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; + case(GL_RGB): internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; case(4): case(GL_RGBA): internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; default: internalFormat = image.getInternalTextureFormat(); break; @@ -618,7 +618,7 @@ void Texture::computeInternalFormatWithImage(const osg::Image& image) const switch(image.getPixelFormat()) { case(3): - case(GL_RGB): internalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; + case(GL_RGB): internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; case(4): case(GL_RGBA): internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; default: internalFormat = image.getInternalTextureFormat(); break;