mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 07:31:21 +02:00
Code Issues Projects Releases Wiki Activity

- a bit of code cleanup related to supporting texture compression on Intel

Browse Source
This commit is contained in:
Mark Vejvoda
2010-10-29 21:18:07 +00:00
parent e299250f94
commit 27212dd962
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/shared_lib/sources/graphics/gl/texture_gl.cpp
View File

@@ -27,11 +27,6 @@ using namespace Shared::Util;
const uint64 MIN_BYTES_TO_COMPRESS = 12; const uint64 MIN_BYTES_TO_COMPRESS = 12;
#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C
#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
static std::string getSupportCompressedTextureFormatString(int format) { static std::string getSupportCompressedTextureFormatString(int format) {
std::string result = intToStr(format) + "[" + intToHex(format) + "]"; std::string result = intToStr(format) + "[" + intToHex(format) + "]";
switch(format) { switch(format) {
@@ -147,7 +142,7 @@ static std::string getSupportCompressedTextureFormatString(int format) {
case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT: case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
result = "GL_COMPRESSED_SLUMINANCE_ALPHA_EXT"; result = "GL_COMPRESSED_SLUMINANCE_ALPHA_EXT";
break; break;
*/
case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
result = "GL_COMPRESSED_SRGB_S3TC_DXT1_EXT"; result = "GL_COMPRESSED_SRGB_S3TC_DXT1_EXT";
break; break;
@@ -163,7 +158,6 @@ static std::string getSupportCompressedTextureFormatString(int format) {
case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
result = "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT"; result = "GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT";
break; break;
/*
case GL_COMPRESSED_LUMINANCE_LATC1_EXT: case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
result = "GL_COMPRESSED_LUMINANCE_LATC1_EXT"; result = "GL_COMPRESSED_LUMINANCE_LATC1_EXT";
@@ -301,11 +295,6 @@ GLint toCompressionFormatGl(GLint format) {
//#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 //#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0
//#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 //#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1
#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C
#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
switch(format) { switch(format) {
case GL_LUMINANCE: case GL_LUMINANCE:
case GL_LUMINANCE8: case GL_LUMINANCE8: