@ -538,10 +538,10 @@ unsigned int Image::computeNumComponents(GLenum pixelFormat)
{
case ( GL_COMPRESSED_RGB_S3TC_DXT1_EXT ) : return 3 ;
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) : return 3 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT ) : return 4 ;
case ( GL_COMPRESSED_SIGNED_RED_RGTC1_EXT ) : return 1 ;
case ( GL_COMPRESSED_RED_RGTC1_EXT ) : return 1 ;
@ -721,13 +721,13 @@ unsigned int Image::computePixelSizeInBits(GLenum format,GLenum type)
switch ( format )
{
case ( GL_COMPRESSED_RGB_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) : return 8 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) : return 8 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) : return 8 ;
case ( GL_COMPRESSED_RGB_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) : return 4 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) : return 8 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) : return 8 ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) : return 8 ;
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT ) : return 8 ;
case ( GL_COMPRESSED_SIGNED_RED_RGTC1_EXT ) : return 4 ;
case ( GL_COMPRESSED_RED_RGTC1_EXT ) : return 4 ;
@ -948,14 +948,14 @@ unsigned int Image::computeBlockSize(GLenum pixelFormat, GLenum packing)
{
switch ( pixelFormat )
{
case ( GL_COMPRESSED_RGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) :
return osg : : maximum ( 8u , packing ) ; // block size of 8
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_RGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) :
return osg : : maximum ( 8u , packing ) ; // block size of 8
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG ) :
case ( GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG ) :
@ -1106,12 +1106,12 @@ bool Image::isCompressed() const
case ( GL_COMPRESSED_RGBA_ARB ) :
case ( GL_COMPRESSED_RGB_ARB ) :
case ( GL_COMPRESSED_RGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_SIGNED_RED_RGTC1_EXT ) :
case ( GL_COMPRESSED_RED_RGTC1_EXT ) :
@ -2030,11 +2030,11 @@ bool Image::isImageTranslucent() const
case ( GL_COMPRESSED_RGB_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_S3TC_DXT1_EXT ) :
return false ;
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT ) :
case ( GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) :
case ( GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT ) :
return dxtc_tool : : isCompressedImageTranslucent ( _s , _t , _pixelFormat , _data ) ;
default :