zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stuff

This commit is contained in:
Christoph Oelckers 2019-09-17 20:57:45 +02:00
parent a49fe10a61
commit 155f093bd5
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/build/include/build.h
View File

@ -1337,7 +1337,6 @@ enum {
TEXFILTER_ON = 5, // GL_LINEAR_MIPMAP_LINEAR TEXFILTER_ON = 5, // GL_LINEAR_MIPMAP_LINEAR
}; };
extern int32_t glusememcache;
extern int32_t glmultisample, glnvmultisamplehint; extern int32_t glmultisample, glnvmultisamplehint;
extern int32_t glprojectionhacks; extern int32_t glprojectionhacks;
extern int32_t gltexmaxsize; extern int32_t gltexmaxsize;

13
source/build/src/polymost.cpp
View File

@ -95,7 +95,6 @@ struct glfiltermodes glfiltermodes[NUMGLFILTERMODES] =
int32_t glanisotropy = 0; // 0 = maximum supported by card int32_t glanisotropy = 0; // 0 = maximum supported by card
int32_t gltexfiltermode = TEXFILTER_OFF; int32_t gltexfiltermode = TEXFILTER_OFF;
int32_t glusememcache = 1;
int32_t r_polygonmode = 0; // 0:GL_FILL,1:GL_LINE,2:GL_POINT //FUK int32_t r_polygonmode = 0; // 0:GL_FILL,1:GL_LINE,2:GL_POINT //FUK
static int32_t lastglpolygonmode = 0; //FUK static int32_t lastglpolygonmode = 0; //FUK
@ -623,7 +622,7 @@ void polymost_setTexturePosSize(vec4f_t const &texturePosSize)
static inline void polymost_setHalfTexelSize(vec2f_t const &halfTexelSize) static inline void polymost_setHalfTexelSize(vec2f_t const &halfTexelSize)
{ {
if (currentShaderProgramID != polymost1CurrentShaderProgramID || (halfTexelSize.x == polymost1HalfTexelSize.x && halfTexelSize.y == polymost1HalfTexelSize.y)) if (currentShaderProgramID != polymost1CurrentShaderProgramID)
return; return;
polymost1HalfTexelSize = halfTexelSize; polymost1HalfTexelSize = halfTexelSize;
@ -634,7 +633,7 @@ static void polymost_setPalswap(uint32_t index)
{ {
static uint32_t lastPalswapIndex; static uint32_t lastPalswapIndex;
if (currentShaderProgramID != polymost1CurrentShaderProgramID || index == lastPalswapIndex) if (currentShaderProgramID != polymost1CurrentShaderProgramID)
return; return;
lastPalswapIndex = index; lastPalswapIndex = index;
@ -698,7 +697,7 @@ static void polymost_setVisibility(float visibility)
void polymost_setFogEnabled(char fogEnabled) void polymost_setFogEnabled(char fogEnabled)
{ {
if (currentShaderProgramID != polymost1CurrentShaderProgramID || fogEnabled == polymost1FogEnabled) if (currentShaderProgramID != polymost1CurrentShaderProgramID)
return; return;
polymost1FogEnabled = fogEnabled; polymost1FogEnabled = fogEnabled;
@ -707,7 +706,7 @@ void polymost_setFogEnabled(char fogEnabled)
void polymost_useColorOnly(char useColorOnly) void polymost_useColorOnly(char useColorOnly)
{ {
if (currentShaderProgramID != polymost1CurrentShaderProgramID || useColorOnly == polymost1UseColorOnly) if (currentShaderProgramID != polymost1CurrentShaderProgramID)
return; return;
polymost1UseColorOnly = useColorOnly; polymost1UseColorOnly = useColorOnly;
@ -716,7 +715,7 @@ void polymost_useColorOnly(char useColorOnly)
void polymost_usePaletteIndexing(char usePaletteIndexing) void polymost_usePaletteIndexing(char usePaletteIndexing)
{ {
if (currentShaderProgramID != polymost1CurrentShaderProgramID || usePaletteIndexing == polymost1UsePalette) if (currentShaderProgramID != polymost1CurrentShaderProgramID)
return; return;
polymost1UsePalette = usePaletteIndexing; polymost1UsePalette = usePaletteIndexing;
@ -7451,9 +7450,7 @@ static int osdcmd_cvar_set_polymost(osdcmdptr_t parm)
r_downsizevar = r_downsize; r_downsizevar = r_downsize;
} }
else if (!Bstrcasecmp(parm->name, "r_anisotropy")) else if (!Bstrcasecmp(parm->name, "r_anisotropy"))
{
gltexapplyprops(); gltexapplyprops();
}
else if (!Bstrcasecmp(parm->name, "r_texfilter")) else if (!Bstrcasecmp(parm->name, "r_texfilter"))
gltexturemode(parm); gltexturemode(parm);
else if (!Bstrcasecmp(parm->name, "r_usenewshading")) else if (!Bstrcasecmp(parm->name, "r_usenewshading"))