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

Remove r_usetileshades--GLOBAL_NO_GL_TILESHADES flag for DN64 not affected

Browse source 
This also locks the texture filtering options in the menu behind ifdef guards until they're fixed.

git-svn-id: https://svn.eduke32.com/eduke32@7420 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/polymost.cpp
#	source/duke3d/src/menus.cpp
This commit is contained in:
terminx 2019-03-19 17:09:12 +00:00 committed by Christoph Oelckers
parent 0168b9ddf2
commit a5965e2562
6 changed files with 21 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/build/include/polymost.h
View file

@ -82,7 +82,6 @@ extern int32_t shadescale_unbounded;
extern uint8_t alphahackarray[MAXTILES];
extern int32_t r_usenewshading;
extern int32_t r_usetileshades;
extern int32_t r_npotwallmode;
extern int32_t r_brightnesshack;
@ -98,9 +97,7 @@ static inline float getshadefactor(int32_t const shade)
{
// 8-bit tiles, i.e. non-hightiles and non-models, don't get additional
// glColor() shading with r_usetileshades!
if (videoGetRenderMode() == REND_POLYMOST && r_usetileshades &&
!(globalflags & GLOBAL_NO_GL_TILESHADES) &&
eligible_for_tileshades(globalpicnum, globalpal))
if (videoGetRenderMode() == REND_POLYMOST && !(globalflags & GLOBAL_NO_GL_TILESHADES) && eligible_for_tileshades(globalpicnum, globalpal))
return 1.f;
if (r_usenewshading == 4)

3
source/build/src/config.cpp
View file

@ -401,7 +401,6 @@ int32_t writesetup(const char *fn)
"r_texcompr = %d ;;\n"
"r_shadescale = %g ;;\n"
"r_usenewshading = %d ;;\n"
"r_usetileshades = %d ;;\n"
# ifdef POLYMER
"r_pr_artmapping = %d ;;\n"
# endif
@ -614,7 +613,7 @@ int32_t writesetup(const char *fn)
#ifdef USE_OPENGL
usemodels, usehightile, g_lazy_tileselector,
glusetexcache, glusememcache, gltexfiltermode, glanisotropy,r_downsize,glusetexcompr,
shadescale, r_usenewshading, r_usetileshades,
shadescale, r_usenewshading,
# ifdef POLYMER
pr_artmapping,
# endif

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

@ -63,7 +63,6 @@ int32_t shadescale_unbounded = 0;
int32_t r_enablepolymost2 = 0;
int32_t r_pogoDebug = 0;
int32_t r_usenewshading = 4;
int32_t r_usetileshades = 2;
int32_t r_npotwallmode = 2;
static float gviewxrange;
@ -580,12 +579,8 @@ static void polymost_setShade(int32_t shade)
if (currentShaderProgramID != polymost1CurrentShaderProgramID)
return;
if (!r_usetileshades || (globalflags & GLOBAL_NO_GL_TILESHADES))
if (globalflags & GLOBAL_NO_GL_TILESHADES)
shade = 0;
#if 0
else
shade = getpalookup(r_usetileshades == 1, shade);
#endif
static int32_t lastShade;
static int32_t lastNumShades;
@ -1117,7 +1112,7 @@ static void fogcalc_old(int32_t shade, int32_t vis)
static inline void fogcalc(int32_t tile, int32_t shade, int32_t vis, int32_t pal)
{
if (shade > 0 && videoGetRenderMode() == REND_POLYMOST && r_usetileshades == 1 &&
if (shade > 0 && videoGetRenderMode() == REND_POLYMOST &&
!(globalflags & GLOBAL_NO_GL_TILESHADES) &&
(!usehightile || !hicfindsubst(tile, pal, hictinting[pal].f & HICTINT_ALWAYSUSEART)) &&
(!usemodels || md_tilehasmodel(tile, pal) < 0))
@ -2068,10 +2063,9 @@ static uint8_t drawpoly_blend = 0;
static inline pthtyp *our_texcache_fetch(int32_t dameth)
{
if (r_usenewshading == 4)
return texcache_fetch(globalpicnum, globalpal, getpalookup((r_usetileshades == 1 && !(globalflags & GLOBAL_NO_GL_TILESHADES)), globalshade), dameth);
return texcache_fetch(globalpicnum, globalpal, getpalookup(!(globalflags & GLOBAL_NO_GL_TILESHADES), globalshade), dameth);
// r_usetileshades 1 is TX's method.
return texcache_fetch(globalpicnum, globalpal, getpalookup((r_usetileshades == 1 && !(globalflags & GLOBAL_NO_GL_TILESHADES)) ? globvis>>3 : 0, globalshade), dameth);
return texcache_fetch(globalpicnum, globalpal, getpalookup(!(globalflags & GLOBAL_NO_GL_TILESHADES) ? globvis>>3 : 0, globalshade), dameth);
}
@ -2414,7 +2408,6 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
{
polytint_t const & tint = hictinting[globalpal];
float shadeFactor = (pth->flags & PTH_INDEXED) &&
r_usetileshades &&
!(globalflags & GLOBAL_NO_GL_TILESHADES) ? 1.f : getshadefactor(globalshade);
pc[0] = (1.f-(tint.sr*(1.f/255.f)))*shadeFactor+(tint.sr*(1.f/255.f));
pc[1] = (1.f-(tint.sg*(1.f/255.f)))*shadeFactor+(tint.sg*(1.f/255.f));
@ -7256,7 +7249,6 @@ void polymost_initosdfuncs(void)
(void *) &r_usenewshading, CVAR_INT|CVAR_FUNCPTR, 0, 4
},
{ "r_usetileshades", "enable/disable Polymost tile shade textures", (void *) &r_usetileshades, CVAR_INT | CVAR_INVALIDATEART, 0, 2 },
{ "r_projectionhack", "enable/disable projection hack", (void *) &glprojectionhacks, CVAR_INT, 0, 1 },

2
source/build/src/texcache.cpp
View file

@ -118,7 +118,7 @@ pthtyp *texcache_fetch(int32_t dapicnum, int32_t dapalnum, int32_t dashade, int3
if ((si = hicfindskybox(dapicnum, dapalnum)) == NULL)
return NULL;
if (!r_usetileshades || (globalflags & GLOBAL_NO_GL_TILESHADES) || videoGetRenderMode() != REND_POLYMOST)
if ((globalflags & GLOBAL_NO_GL_TILESHADES) || videoGetRenderMode() != REND_POLYMOST)
dashade = 0;
if (!si)

33
source/duke3d/src/menus.cpp
View file

@ -555,15 +555,9 @@ static MenuEntry_t ME_DISPLAYSETUP_FOV = MAKE_MENUENTRY( "FOV:", &MF_Redfont, &M
#ifdef USE_OPENGL
static int32_t MEOSV_PaletteEmulation[] = { 0, r_usetileshades };
static MenuOptionSet_t MEOS_PaletteEmulation = MAKE_MENUOPTIONSET( MEOSN_OffOn, MEOSV_PaletteEmulation, 0x3 );
# if !(defined EDUKE32_STANDALONE) || defined POLYMER
# ifdef EDUKE32_SIMPLE_MENU
static MenuOption_t MEO_DISPLAYSETUP_PALETTEEMULATION = MAKE_MENUOPTION(&MF_Redfont, &MEOS_PaletteEmulation, &r_usetileshades);
static MenuEntry_t ME_DISPLAYSETUP_PALETTEEMULATION = MAKE_MENUENTRY("Palette emulation:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_PALETTEEMULATION, Option);
# endif
//POGOTODO: allow filtering again in standalone once indexed colour textures support filtering
#ifdef TEXFILTER_MENU_OPTIONS
static char const *MEOSN_DISPLAYSETUP_TEXFILTER[] = { "Classic", "Filtered" };
static int32_t MEOSV_DISPLAYSETUP_TEXFILTER[] = { TEXFILTER_OFF, TEXFILTER_ON };
static MenuOptionSet_t MEOS_DISPLAYSETUP_TEXFILTER = MAKE_MENUOPTIONSET( MEOSN_DISPLAYSETUP_TEXFILTER, MEOSV_DISPLAYSETUP_TEXFILTER, 0x2 );
@ -575,6 +569,7 @@ static int32_t MEOSV_DISPLAYSETUP_ANISOTROPY[] = { 0, 1, 2, 4, 8, 16, };
static MenuOptionSet_t MEOS_DISPLAYSETUP_ANISOTROPY = MAKE_MENUOPTIONSET( MEOSN_DISPLAYSETUP_ANISOTROPY, MEOSV_DISPLAYSETUP_ANISOTROPY, 0x0 );
static MenuOption_t MEO_DISPLAYSETUP_ANISOTROPY = MAKE_MENUOPTION(&MF_Redfont, &MEOS_DISPLAYSETUP_ANISOTROPY, &glanisotropy);
static MenuEntry_t ME_DISPLAYSETUP_ANISOTROPY = MAKE_MENUENTRY( "Anisotropy:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_ANISOTROPY, Option );
#endif
# endif
# ifdef EDUKE32_ANDROID_MENU
@ -741,20 +736,20 @@ static MenuEntry_t *MEL_DISPLAYSETUP_GL[] = {
&ME_DISPLAYSETUP_FOV,
#endif
#ifndef EDUKE32_STANDALONE
# ifdef TEXFILTER_MENU_OPTIONS
&ME_DISPLAYSETUP_TEXFILTER,
# endif
#endif
#ifdef EDUKE32_ANDROID_MENU
&ME_DISPLAYSETUP_HIDEDPAD,
&ME_DISPLAYSETUP_TOUCHALPHA,
#else
# ifndef EDUKE32_STANDALONE
# ifdef TEXFILTER_MENU_OPTIONS
&ME_DISPLAYSETUP_ANISOTROPY,
# endif
# ifdef EDUKE32_SIMPLE_MENU
# ifndef EDUKE32_STANDALONE
&ME_DISPLAYSETUP_PALETTEEMULATION,
# endif
# else
# ifndef EDUKE32_SIMPLE_MENU
&ME_DISPLAYSETUP_ADVANCED_GL_POLYMOST,
# endif
#endif
@ -768,8 +763,10 @@ static MenuEntry_t *MEL_DISPLAYSETUP_GL_POLYMER[] = {
&ME_DISPLAYSETUP_VIDEOSETUP,
&ME_DISPLAYSETUP_FOV,
#endif
#ifdef TEXFILTER_MENU_OPTIONS
&ME_DISPLAYSETUP_TEXFILTER,
&ME_DISPLAYSETUP_ANISOTROPY,
#endif
#ifndef EDUKE32_SIMPLE_MENU
&ME_DISPLAYSETUP_ADVANCED_GL_POLYMER,
#endif
@ -1032,8 +1029,6 @@ static MenuEntry_t ME_RENDERERSETUP_GLOWTEX = MAKE_MENUENTRY("Glow textures:", &
# endif
static MenuOption_t MEO_RENDERERSETUP_MODELS = MAKE_MENUOPTION( &MF_Bluefont, &MEOS_NoYes, &usemodels );
static MenuEntry_t ME_RENDERERSETUP_MODELS = MAKE_MENUENTRY( "3D models:", &MF_Bluefont, &MEF_SmallOptions, &MEO_RENDERERSETUP_MODELS, Option );
static MenuOption_t MEO_RENDERERSETUP_PALETTEEMULATION = MAKE_MENUOPTION(&MF_Bluefont, &MEOS_PaletteEmulation, &r_usetileshades);
static MenuEntry_t ME_RENDERERSETUP_PALETTEEMULATION = MAKE_MENUENTRY("Palette emulation:", &MF_Bluefont, &MEF_SmallOptions, &MEO_RENDERERSETUP_PALETTEEMULATION, Option);
#endif
@ -1048,7 +1043,6 @@ static MenuEntry_t *MEL_RENDERERSETUP_POLYMOST[] = {
# endif
&ME_Space4_Bluefont,
&ME_RENDERERSETUP_MODELS,
&ME_RENDERERSETUP_PALETTEEMULATION,
};
#endif
@ -1903,14 +1897,12 @@ static void Menu_Pre(MenuID_t cm)
-1;
#ifndef EDUKE32_STANDALONE
#ifdef TEXFILTER_MENU_OPTIONS
if (videoGetRenderMode() != REND_CLASSIC)
{
//POGOTODO: allow setting anisotropy again while r_useindexedcolortextures is set when support is added down the line
// don't allow setting anisotropy or changing palette emulation while in POLYMOST and r_useindexedcolortextures is enabled
// don't allow setting anisotropy while in POLYMOST and r_useindexedcolortextures is enabled
MenuEntry_DisableOnCondition(&ME_DISPLAYSETUP_ANISOTROPY, videoGetRenderMode() == REND_POLYMOST && r_useindexedcolortextures);
#ifdef EDUKE32_SIMPLE_MENU
MenuEntry_DisableOnCondition(&ME_DISPLAYSETUP_PALETTEEMULATION, videoGetRenderMode() == REND_POLYMOST && r_useindexedcolortextures);
#endif
for (i = (int32_t) ARRAY_SIZE(MEOSV_DISPLAYSETUP_ANISOTROPY) - 1; i >= 0; --i)
{
@ -1921,6 +1913,7 @@ static void Menu_Pre(MenuID_t cm)
}
}
}
#endif
#endif
break;
@ -1932,8 +1925,6 @@ static void Menu_Pre(MenuID_t cm)
MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_DETAILTEX, !usehightile);
MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_GLOWTEX, !usehightile);
# endif
// don't allow changing palette emulation while in POLYMOST and r_useindexedcolortextures is enabled
MenuEntry_DisableOnCondition(&ME_RENDERERSETUP_PALETTEEMULATION, videoGetRenderMode() == REND_POLYMOST && r_useindexedcolortextures);
break;
#endif
@ -3236,8 +3227,10 @@ static void Menu_EntryOptionDidModify(MenuEntry_t *entry)
}
#ifdef USE_OPENGL
#ifndef EDUKE32_STANDALONE
#ifdef TEXFILTER_MENU_OPTIONS
else if (entry == &ME_DISPLAYSETUP_ANISOTROPY || entry == &ME_DISPLAYSETUP_TEXFILTER)
gltexapplyprops();
#endif
#endif
else if (entry == &ME_RENDERERSETUP_TEXQUALITY)
{

1
source/duke3d/src/screens.cpp
View file

@ -697,7 +697,6 @@ static void G_PrintCoords(int32_t snum)
else
printcoordsline("r_pr_artmapping = %d", pr_artmapping);
#endif
printcoordsline("r_usetileshades = %d", r_usetileshades);
}
}
#endif