zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adds the last texture filter mode (trilinear min filter with nearest magnification)

Browse source
This commit is contained in:
Magnus Norddahl 2016-07-23 09:16:34 +02:00 committed by Christoph Oelckers
parent 669238db66
commit 41e959e102
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gl/textures/gl_texture.cpp
View file

@ -71,7 +71,7 @@ CCMD(gl_flush)
CUSTOM_CVAR(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL) CUSTOM_CVAR(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL)
{ {
if (self < 0 || self > 5) self=4; if (self < 0 || self > 6) self=4;
if (GLRenderer != NULL && GLRenderer->mSamplerManager != NULL) GLRenderer->mSamplerManager->SetTextureFilterMode(); if (GLRenderer != NULL && GLRenderer->mSamplerManager != NULL) GLRenderer->mSamplerManager->SetTextureFilterMode();
} }
@ -105,6 +105,7 @@ TexFilter_s TexFilter[]={
{GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR, true}, {GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR, true},
{GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR, true}, {GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR, true},
{GL_NEAREST_MIPMAP_LINEAR, GL_NEAREST, true}, {GL_NEAREST_MIPMAP_LINEAR, GL_NEAREST, true},
{GL_LINEAR_MIPMAP_LINEAR, GL_NEAREST, true},
}; };
int TexFormat[]={ int TexFormat[]={

1
wadsrc/static/language.enu
View file

@ -2625,6 +2625,7 @@ OPTVAL_INFRAREDANDTORCH = "Infrared and torch";
OPTVAL_ANYFIXEDCOLORMAP = "Any fixed colormap"; OPTVAL_ANYFIXEDCOLORMAP = "Any fixed colormap";
OPTVAL_NONENEARESTMIPMAP = "None (nearest mipmap)"; OPTVAL_NONENEARESTMIPMAP = "None (nearest mipmap)";
OPTVAL_NONELINEARMIPMAP = "None (linear mipmap)"; OPTVAL_NONELINEARMIPMAP = "None (linear mipmap)";
OPTVAL_NONETRILINEAR = "None (trilinear)";
OPTVAL_BILINEAR = "Bilinear"; OPTVAL_BILINEAR = "Bilinear";
OPTVAL_TRILINEAR = "Trilinear"; OPTVAL_TRILINEAR = "Trilinear";
OPTVAL_RGBA8 = "RGBA8"; OPTVAL_RGBA8 = "RGBA8";

1
wadsrc/static/menudef.z
View file

@ -19,6 +19,7 @@ OptionValue "FilterModes"
0, "$OPTVAL_NONE" 0, "$OPTVAL_NONE"
1, "$OPTVAL_NONENEARESTMIPMAP" 1, "$OPTVAL_NONENEARESTMIPMAP"
5, "$OPTVAL_NONELINEARMIPMAP" 5, "$OPTVAL_NONELINEARMIPMAP"
6, "$OPTVAL_NONETRILINEAR"
2, "$OPTVAL_LINEAR" 2, "$OPTVAL_LINEAR"
3, "$OPTVAL_BILINEAR" 3, "$OPTVAL_BILINEAR"
4, "$OPTVAL_TRILINEAR" 4, "$OPTVAL_TRILINEAR"