mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-12 03:00:38 +00:00
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
This commit is contained in:
parent
51eb2c7cd3
commit
1579d2edd3
2 changed files with 6 additions and 6 deletions
|
@ -1826,7 +1826,7 @@ int32_t gloadtile_hi(int32_t dapic,int32_t dapalnum, int32_t facen, hicreplctyp
|
||||||
hicr->flags |= 17;
|
hicr->flags |= 17;
|
||||||
|
|
||||||
if (glinfo.texcompr && glusetexcompr && !(hicr->flags & 1))
|
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;
|
else if (hasalpha == 255) intexfmt = GL_RGB;
|
||||||
|
|
||||||
if ((doalloc&3)==1) bglGenTextures(1,(GLuint*)&pth->glpic); //# of textures (make OpenGL allocate structure)
|
if ((doalloc&3)==1) bglGenTextures(1,(GLuint*)&pth->glpic); //# of textures (make OpenGL allocate structure)
|
||||||
|
|
|
@ -315,7 +315,7 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
|
||||||
hInstance = hInst;
|
hInstance = hInst;
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
_CrtSetDbgFlag(_CRTDBG_CHECK_ALWAYS_DF);
|
_CrtSetDbgFlag(_CRTDBG_CHECK_ALWAYS_DF);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!CheckWinVersion() || hPrevInst)
|
if (!CheckWinVersion() || hPrevInst)
|
||||||
|
@ -2022,9 +2022,9 @@ void showframe(int32_t w)
|
||||||
bglColor4ub(palfadergb.r, palfadergb.g, palfadergb.b, palfadedelta);
|
bglColor4ub(palfadergb.r, palfadergb.g, palfadergb.b, palfadedelta);
|
||||||
|
|
||||||
bglBegin(GL_TRIANGLES);
|
bglBegin(GL_TRIANGLES);
|
||||||
bglVertex2f(-2.5f, 1.f);
|
bglVertex2f(-2.5f, 1.f);
|
||||||
bglVertex2f(2.5f, 1.f);
|
bglVertex2f(2.5f, 1.f);
|
||||||
bglVertex2f(.0f, -2.5f);
|
bglVertex2f(.0f, -2.5f);
|
||||||
bglEnd();
|
bglEnd();
|
||||||
|
|
||||||
bglDisable(GL_BLEND);
|
bglDisable(GL_BLEND);
|
||||||
|
@ -2851,7 +2851,7 @@ static int32_t SetupOpenGL(int32_t width, int32_t height, int32_t bitspp)
|
||||||
pr_ati_fboworkaround = 1;
|
pr_ati_fboworkaround = 1;
|
||||||
initprintf("Enabling ATI FBO color attachment workaround.\n");
|
initprintf("Enabling ATI FBO color attachment workaround.\n");
|
||||||
#endif
|
#endif
|
||||||
if (!Bstrncmp(glinfo.renderer,"Radeon X1", 9))
|
if (Bstrstr(glinfo.renderer,"Radeon X1"))
|
||||||
{
|
{
|
||||||
r_vbos = 0;
|
r_vbos = 0;
|
||||||
#ifdef POLYMER
|
#ifdef POLYMER
|
||||||
|
|
Loading…
Reference in a new issue