zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 11:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

GL: In uploadtexture, don't assume that a non-masking texture can safely be sent to the driver without the alpha channel.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5770 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-06-05 04:46:40 +00:00
parent f0f7b04652
commit 31e0cdd87b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/build/src/polymost.c
View file

@ -842,7 +842,7 @@ void uploadtexture(int32_t doalloc, vec2_t siz, int32_t texfmt,
const int hi = !!(dameth & DAMETH_HI); const int hi = !!(dameth & DAMETH_HI);
const int nodownsize = !!(dameth & DAMETH_NODOWNSIZE) || artimmunity; const int nodownsize = !!(dameth & DAMETH_NODOWNSIZE) || artimmunity;
const int nomiptransfix = !!(dameth & DAMETH_NOFIX); const int nomiptransfix = !!(dameth & DAMETH_NOFIX);
const int hasalpha = !!(dameth & DAMETH_HASALPHA) && (dameth & DAMETH_MASKPROPS) != DAMETH_NOMASK; const int hasalpha = !!(dameth & DAMETH_HASALPHA);
const int texcompress_ok = !(dameth & DAMETH_NOTEXCOMPRESS) && (glusetexcompr == 2 || (glusetexcompr && !artimmunity)); const int texcompress_ok = !(dameth & DAMETH_NOTEXCOMPRESS) && (glusetexcompr == 2 || (glusetexcompr && !artimmunity));
#if !defined EDUKE32_GLES #if !defined EDUKE32_GLES
@ -1224,7 +1224,7 @@ void gloadtile_art(int32_t dapic, int32_t dapal, int32_t tintpalnum, int32_t das
pth->ofb = (pthtyp *)Xcalloc(1,sizeof(pthtyp)); pth->ofb = (pthtyp *)Xcalloc(1,sizeof(pthtyp));
pth->flags |= PTH_HASFULLBRIGHT; pth->flags |= PTH_HASFULLBRIGHT;
gloadtile_art(dapic, dapal, -1, 0, (dameth & DAMETH_MASKPROPS) == DAMETH_NOMASK ? dameth | DAMETH_MASK : dameth, pth->ofb, 1); gloadtile_art(dapic, dapal, -1, 0, (dameth & ~DAMETH_MASKPROPS) | DAMETH_MASK, pth->ofb, 1);
fullbrightloadingpass = 0; fullbrightloadingpass = 0;
} }
@ -1786,7 +1786,7 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
if (r_glowmapping) if (r_glowmapping)
{ {
if (usehightile && !drawingskybox && hicfindsubst(globalpicnum, GLOWPAL) && if (usehightile && !drawingskybox && hicfindsubst(globalpicnum, GLOWPAL) &&
(glowpth = texcache_fetch(globalpicnum, GLOWPAL, 0, method | DAMETH_MASK)) && (glowpth = texcache_fetch(globalpicnum, GLOWPAL, 0, (method & ~DAMETH_MASKPROPS) | DAMETH_MASK)) &&
glowpth->hicr && (glowpth->hicr->palnum == GLOWPAL)) glowpth->hicr && (glowpth->hicr->palnum == GLOWPAL))
polymost_setupglowtexture(++texunits, glowpth ? glowpth->glpic : 0); polymost_setupglowtexture(++texunits, glowpth ? glowpth->glpic : 0);
} }