From 6c31a721b89beb4dfb084ed27d62399d9469c6be Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 11 Jan 2012 23:41:02 +0000 Subject: [PATCH] #ifdefs for option GL texture compression constants - should fix Windows as well as Mac --- simgear/scene/model/ModelRegistry.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/simgear/scene/model/ModelRegistry.cxx b/simgear/scene/model/ModelRegistry.cxx index 9d8df432..aa1ba083 100644 --- a/simgear/scene/model/ModelRegistry.cxx +++ b/simgear/scene/model/ModelRegistry.cxx @@ -236,24 +236,30 @@ ModelRegistry::readImage(const string& fileName, // GL_EXT_texture_compression_s3tc // patented, no way to decompress these +#if defined(GL_COMPRESSED_RGB_S3TC_DXT1_EXT) case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - +#endif + +#if defined(GL_COMPRESSED_SRGB_S3TC_DXT1_EXT) // GL_EXT_texture_sRGB // patented, no way to decompress these case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: - +#endif + +#if defined(GL_COMPRESSED_RGB_FXT1_3DFX) // GL_TDFX_texture_compression_FXT1 // can decompress these in software but // no code present in simgear. case GL_COMPRESSED_RGB_FXT1_3DFX: case GL_COMPRESSED_RGBA_FXT1_3DFX: - +#endif + // GL_EXT_texture_compression_rgtc // can decompress these in software but // no code present in simgear. -- 2.39.5