zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some GL ES compilation issues in polymost.cpp

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7395 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-03-11 06:06:51 +00:00
parent 6ba0b64de6
commit 5258e10271
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/build/src/polymost.cpp
View file

@ -1579,7 +1579,16 @@ static int32_t const comprtexfmts_rgb[] = { GL_ETC1_RGB8_OES, 0 };
static int32_t const comprtexfmts_rgba[] = { 0 }; static int32_t const comprtexfmts_rgba[] = { 0 };
static int32_t const comprtexfmts_rgb_mask[] = { 0 }; static int32_t const comprtexfmts_rgb_mask[] = { 0 };
#else #else
static int32_t const comprtexfmts_rgb[] = { GL_COMPRESSED_RGB8_ETC2, GL_ETC1_RGB8_OES, 0 }; static int32_t const comprtexfmts_rgb[] =
{
#ifdef GL_COMPRESSED_RGB8_ETC2
GL_COMPRESSED_RGB8_ETC2,
#endif
#ifdef GL_ETC1_RGB8_OES
GL_ETC1_RGB8_OES,
#endif
0
};
// TODO: waiting on etcpak support for ETC2 with alpha // TODO: waiting on etcpak support for ETC2 with alpha
static int32_t const comprtexfmts_rgba[] = { /*GL_COMPRESSED_RGBA8_ETC2_EAC,*/ 0 }; static int32_t const comprtexfmts_rgba[] = { /*GL_COMPRESSED_RGBA8_ETC2_EAC,*/ 0 };
static int32_t const comprtexfmts_rgb_mask[] = { /*GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,*/ 0 }; static int32_t const comprtexfmts_rgb_mask[] = { /*GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,*/ 0 };
@ -1604,16 +1613,21 @@ static ETCFunction_t Polymost_PickETCFunction(int32_t const comprtexfmt)
{ {
switch (comprtexfmt) switch (comprtexfmt)
{ {
# ifdef GL_ETC1_RGB8_OES
case GL_ETC1_RGB8_OES: case GL_ETC1_RGB8_OES:
return ProcessRGB; return ProcessRGB;
# endif
# ifdef GL_COMPRESSED_RGB8_ETC2
case GL_COMPRESSED_RGB8_ETC2: case GL_COMPRESSED_RGB8_ETC2:
return ProcessRGB_ETC2; return ProcessRGB_ETC2;
# endif
# if 0 # if 0
case GL_COMPRESSED_RGBA8_ETC2_EAC: case GL_COMPRESSED_RGBA8_ETC2_EAC:
fallthrough__;
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2: case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
fallthrough__;
# endif # endif
default: default:
@ -1771,6 +1785,7 @@ void uploadtexture(int32_t doalloc, vec2_t siz, int32_t texfmt,
else else
intexfmt = GL_RGBA8; intexfmt = GL_RGBA8;
#else #else
const int hasalpha = !!(dameth & (DAMETH_HASALPHA|DAMETH_ONEBITALPHA));
const int onebitalpha = !!(dameth & DAMETH_ONEBITALPHA); const int onebitalpha = !!(dameth & DAMETH_ONEBITALPHA);
int32_t const intexfmt = hasalpha ? (onebitalpha ? texfmt_rgb_mask : texfmt_rgba) : texfmt_rgb; int32_t const intexfmt = hasalpha ? (onebitalpha ? texfmt_rgb_mask : texfmt_rgba) : texfmt_rgb;