From 77bb0813ef2c055bd1aba88fff892075bc380967 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 29 Jul 2018 23:15:59 +0000
Subject: [PATCH] Assume that GL_ARB_texture_compression is supported.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12442 d7cf8633-e32d-0410-b094-e92efae38249
---
gl_rmain.c | 2 +-
gl_textures.c | 4 +---
menu.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gl_rmain.c b/gl_rmain.c
index 11489141..67f2d68b 100644
--- 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 bae61044..d5ce367b 100644
--- 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 ac1d5c10..34712e21 100644
--- 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++;
--
2.39.5