Assume that GL_ARB_texture_compression is supported.
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 29 Jul 2018 23:15:59 +0000 (23:15 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 29 Jul 2018 23:15:59 +0000 (23:15 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12442 d7cf8633-e32d-0410-b094-e92efae38249

gl_rmain.c
gl_textures.c
menu.c

index 1148914..67f2d68 100644 (file)
@@ -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)
        {
index bae6104..d5ce367 100644 (file)
@@ -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)
@@ -1040,7 +1039,6 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
                                CHECKGLERROR
                        }
 #endif
-#endif
                        switch(glt->texturetype)
                        {
                        case GLTEXTURETYPE_2D:
@@ -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 ac1d5c1..34712e2 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++;