Assume that GL_ARB_texture_compression is supported.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12442 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_rmain.c b/gl_rmain.c
index 11489141bef549b84d8d503afad9df8aeee41a95..67f2d68b6262ce71635c7e7067fb5b7fd946bc99 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3027,7 +3027,7 @@ static void gl_main_start(void)
        r_uniformbufferalignment = 32;
 
        r_loaddds = r_texture_dds_load.integer != 0;
-       r_savedds = vid.support.arb_texture_compression && vid.support.ext_texture_compression_s3tc && r_texture_dds_save.integer;
+       r_savedds = vid.support.ext_texture_compression_s3tc && r_texture_dds_save.integer;
 
        switch(vid.renderpath)
        {

diff --git a/gl_textures.c b/gl_textures.c
index bae61044d54b531229b3d79dc7bcc1ca2e5066aa..d5ce367b3d21406bccb1f6b132c48bce0f48e3c1 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -1030,7 +1030,6 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
                        qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
 
 #ifndef USE_GLES2
-#ifdef GL_TEXTURE_COMPRESSION_HINT_ARB
                        if (qglGetCompressedTexImageARB)
                        {
                                if (gl_texturecompression.integer >= 2)
@@ -1039,7 +1038,6 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
                                        qglHint(GL_TEXTURE_COMPRESSION_HINT_ARB, GL_FASTEST);
                                CHECKGLERROR
                        }
-#endif
 #endif
                        switch(glt->texturetype)
                        {
@@ -1895,7 +1893,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
        force_swdecode = false;
        if(bytesperblock)
        {
-               if(vid.support.arb_texture_compression && vid.support.ext_texture_compression_s3tc)
+               if(vid.support.ext_texture_compression_s3tc)
                {
                        if(r_texture_dds_swdecode.integer > 1)
                                force_swdecode = true;

diff --git a/menu.c b/menu.c
index ac1d5c10e2382da0cd41d04b928f2734ba0c5406..34712e21850e55a61049b57035ebd008180481a9 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2976,7 +2976,7 @@ static void M_Video_Draw (void)
        M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0);
        t++;
 
-       M_ItemPrint(16, video_cursor_table[t], "   Texture Compression", vid.support.arb_texture_compression);
+       M_ItemPrint(16, video_cursor_table[t], "   Texture Compression", true);
        M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
        t++;