From 1579d2edd32cfa20b5e313f36478845a7dc9a08d Mon Sep 17 00:00:00 2001 From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0> Date: Sun, 16 Jan 2011 02:45:54 +0000 Subject: [PATCH] Switch back to using GL_COMPRESSED_RGB_ARB and GL_COMPRESSED_RGBA_ARB instead of explicitly asking for DXT1 and DXT5 (maybe fix white boxes on ATI?), change check for Radeon X1xxx cards to work on mobile cards with different GL_RENDERER strings git-svn-id: https://svn.eduke32.com/eduke32@1761 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/polymost.c | 2 +- polymer/eduke32/build/src/winlayer.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c index 6eb4b727a..d59e94afd 100644 --- a/polymer/eduke32/build/src/polymost.c +++ b/polymer/eduke32/build/src/polymost.c @@ -1826,7 +1826,7 @@ int32_t gloadtile_hi(int32_t dapic,int32_t dapalnum, int32_t facen, hicreplctyp hicr->flags |= 17; if (glinfo.texcompr && glusetexcompr && !(hicr->flags & 1)) - intexfmt = (hasalpha == 255) ? GL_COMPRESSED_RGBA_S3TC_DXT3_EXT : GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; + intexfmt = (hasalpha == 255) ? GL_COMPRESSED_RGB_ARB : GL_COMPRESSED_RGBA_ARB; else if (hasalpha == 255) intexfmt = GL_RGB; if ((doalloc&3)==1) bglGenTextures(1,(GLuint*)&pth->glpic); //# of textures (make OpenGL allocate structure) diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c index e10108f1f..4cbae9793 100644 --- a/polymer/eduke32/build/src/winlayer.c +++ b/polymer/eduke32/build/src/winlayer.c @@ -315,7 +315,7 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in hInstance = hInst; #ifdef _MSC_VER - _CrtSetDbgFlag(_CRTDBG_CHECK_ALWAYS_DF); + _CrtSetDbgFlag(_CRTDBG_CHECK_ALWAYS_DF); #endif if (!CheckWinVersion() || hPrevInst) @@ -2022,9 +2022,9 @@ void showframe(int32_t w) bglColor4ub(palfadergb.r, palfadergb.g, palfadergb.b, palfadedelta); bglBegin(GL_TRIANGLES); - bglVertex2f(-2.5f, 1.f); - bglVertex2f(2.5f, 1.f); - bglVertex2f(.0f, -2.5f); + bglVertex2f(-2.5f, 1.f); + bglVertex2f(2.5f, 1.f); + bglVertex2f(.0f, -2.5f); bglEnd(); bglDisable(GL_BLEND); @@ -2851,7 +2851,7 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp) pr_ati_fboworkaround = 1; initprintf("Enabling ATI FBO color attachment workaround.\n"); #endif - if (!Bstrncmp(glinfo.renderer,"Radeon X1", 9)) + if (Bstrstr(glinfo.renderer,"Radeon X1")) { r_vbos = 0; #ifdef POLYMER