diff --git a/source/build/include/build.h b/source/build/include/build.h index 40e33ceb4..555603082 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -1103,8 +1103,6 @@ enum { }; extern int32_t gltexmaxsize; -void gltexapplyprops (void); -void texcache_invalidate(void); EXTERN_CVAR(Bool, hw_detailmapping) EXTERN_CVAR(Bool, hw_glowmapping) diff --git a/source/build/src/animvpx.cpp b/source/build/src/animvpx.cpp index 8fffb06fb..5ef1b66d7 100644 --- a/source/build/src/animvpx.cpp +++ b/source/build/src/animvpx.cpp @@ -420,18 +420,7 @@ void animvpx_setup_glstate(int32_t animvpx_flags) ////////// GL STATE ////////// vpxtex[0] = MakeGameTexture(new VPXTexture, nullptr, ETextureType::Special); vpxtex[1] = MakeGameTexture(new VPXTexture, nullptr, ETextureType::Special); - - if ((animvpx_flags & CUTSCENE_TEXTUREFILTER && gl_texture_filter == TEXFILTER_ON) || animvpx_flags & CUTSCENE_FORCEFILTER || - (!(animvpx_flags & CUTSCENE_TEXTUREFILTER) && !(animvpx_flags & CUTSCENE_FORCENOFILTER))) // if no flags, then use filter for IVFs - { - sampler = CLAMP_XY; - } - else - { - sampler = CLAMP_XY; - } - - + sampler = CLAMP_XY; GLInterface.ClearScreen(0, true); } diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index ef8f1d1d9..602c349fc 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -120,11 +120,6 @@ float sectorVisibility(int sectnum) return v? ((uint8_t)(v + 16)) / 16.f : 1.f; } -void gltexapplyprops(void) -{ - screen->SetTextureFilterMode(); -} - //-------------------------------------------------------------------------------------------------- //Use this for both initialization and uninitialization of OpenGL. diff --git a/source/duke3d/src/anim.cpp b/source/duke3d/src/anim.cpp index 15f38ee48..880813eef 100644 --- a/source/duke3d/src/anim.cpp +++ b/source/duke3d/src/anim.cpp @@ -31,8 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "animtexture.h" #include "v_2ddrawer.h" -#include "../glbackend/glbackend.h" - +#include "v_video.h" #include "anim.h" @@ -523,7 +522,7 @@ int32_t Anim_Play(const char *fn) end_anim_restore_gl: gl_texture_filter = ogltexfiltermode; - gltexapplyprops(); + screen->SetTextureFilterMode(); end_anim: inputState.ClearAllInput(); anim->animbuf = nullptr; diff --git a/source/rr/src/anim.cpp b/source/rr/src/anim.cpp index 4cf94011c..eef671119 100644 --- a/source/rr/src/anim.cpp +++ b/source/rr/src/anim.cpp @@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "cmdlib.h" #include "v_2ddrawer.h" #include "animtexture.h" +#include "v_video.h" #include "../glbackend/glbackend.h" @@ -562,7 +563,7 @@ int32_t Anim_Play(const char *fn) end_anim_restore_gl: gl_texture_filter = ogltexfiltermode; - gltexapplyprops(); + screen->SetTextureFilterMode(); end_anim: inputState.ClearAllInput(); anim->animbuf = nullptr;