Changeset 9970

Show
Ignore:
Timestamp:
03/26/09 11:25:50 (4 years ago)
Author:
robert
Message:

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.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Texture.cpp

    r9539 r9970  
    604604                { 
    605605                    case(3): 
    606                     case(GL_RGB):   internalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; 
     606                    case(GL_RGB):   internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; 
    607607                    case(4): 
    608608                    case(GL_RGBA):  internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; 
    … …  
    619619                { 
    620620                    case(3): 
    621                     case(GL_RGB):   internalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; 
     621                    case(GL_RGB):   internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; 
    622622                    case(4): 
    623623                    case(GL_RGBA):  internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break;