Commit 9ee394fb authored by Evan Ramos's avatar Evan Ramos
Browse files

Don't set the r_useindexedcolortextures cvar to 0 when enabling filtering

The cfg file should reflect the user's preferences even if the features
don't take effect. The cvars' descriptions document the incompatibility
that is happening.
parent 71782260
......@@ -165,7 +165,7 @@ static GLint fogRangeLoc = -1;
static GLint fogColorLoc = -1;
#define PALSWAP_TEXTURE_SIZE 2048
int32_t r_useindexedcolortextures = -1;
int32_t r_useindexedcolortextures = 1;
static GLuint tilesheetTexIDs[MAXTILESHEETS];
static GLint tilesheetSize = 0;
static vec2f_t tilesheetHalfTexelSize = { 0.f, 0.f };
......@@ -365,7 +365,6 @@ void gltexapplyprops(void)
}
gltexfiltermode = clamp(gltexfiltermode, 0, NUMGLFILTERMODES-1);
r_useindexedcolortextures = !gltexfiltermode;
for (bssize_t i=0; i<=GLTEXCACHEADSIZ-1; i++)
{
......@@ -943,12 +942,6 @@ void polymost_glinit()
//glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
//glEnable(GL_LINE_SMOOTH);
if (r_useindexedcolortextures == -1)
{
//POGO: r_useindexedcolortextures has never been set, so force it to be enabled
gltexfiltermode = 0;
}
#ifdef USE_GLEXT
if (r_persistentStreamBuffer && ((!glinfo.bufferstorage) || (!glinfo.sync)))
{
......
......@@ -2182,10 +2182,6 @@ static void Menu_Pre(MenuID_t cm)
#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 while in POLYMOST and r_useindexedcolortextures is enabled
MenuEntry_DisableOnCondition(&ME_DISPLAYSETUP_ANISOTROPY, videoGetRenderMode() == REND_POLYMOST && r_useindexedcolortextures);
for (i = (int32_t) ARRAY_SIZE(MEOSV_DISPLAYSETUP_ANISOTROPY) - 1; i >= 0; --i)
{
if (MEOSV_DISPLAYSETUP_ANISOTROPY[i] <= glinfo.maxanisotropy)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment