zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix mistakes in r5642.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5645 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-03-07 11:21:46 +00:00
parent 7011b30e50
commit c73e8c5036
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/src/mdsprite.c
View file

@ -903,7 +903,7 @@ int32_t mdloadskin(md2model_t *m, int32_t number, int32_t pal, int32_t surf)
int32_t const texfmt = glinfo.bgra ? GL_BGRA : GL_RGBA;
uploadtexture((doalloc&1), siz, texfmt, pic, siz,
DAMETH_HI |
DAMETH_HI | DAMETH_MASK |
TO_DAMETH_NODOWNSIZE(sk->flags) |
TO_DAMETH_NOTEXCOMPRESS(sk->flags) |
(hasalpha ? DAMETH_HASALPHA : 0));

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

@ -678,8 +678,6 @@ void uploadtexture(int32_t doalloc, vec2_t siz, int32_t texfmt,
const int nomiptransfix = !!(dameth & DAMETH_NOFIX);
const int hasalpha = !!(dameth & DAMETH_HASALPHA) && (dameth & DAMETH_MASKPROPS) != DAMETH_NOMASK;
dameth &= ~(DAMETH_HI|DAMETH_NODOWNSIZE|DAMETH_NOFIX|DAMETH_NOTEXCOMPRESS|DAMETH_HASALPHA|DAMETH_ONEBITALPHA);
#if !defined EDUKE32_GLES
const int texcompress_ok = !(dameth & DAMETH_NOTEXCOMPRESS);
@ -695,6 +693,8 @@ void uploadtexture(int32_t doalloc, vec2_t siz, int32_t texfmt,
int32_t intexfmt = **intexfmt_master;
#endif
dameth &= ~(DAMETH_HI|DAMETH_NODOWNSIZE|DAMETH_NOFIX|DAMETH_NOTEXCOMPRESS|DAMETH_HASALPHA|DAMETH_ONEBITALPHA);
if (gltexmaxsize <= 0)
{
GLint i = 0;