From 1446f1baa34c9e5170dca2235a920ca3f53b326f Mon Sep 17 00:00:00 2001 From: zaphod77 Date: Mon, 16 Dec 2024 11:44:01 -0800 Subject: [PATCH] more changes to hopefully get this pull request through. --- src/gl/gl.cpp | 10 ++++++++++ src/renderer.cpp | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/gl/gl.cpp b/src/gl/gl.cpp index abe32bb9..374eca7b 100644 --- a/src/gl/gl.cpp +++ b/src/gl/gl.cpp @@ -131,6 +131,16 @@ void gl_draw_movie_quad_common(uint32_t width, uint32_t height) current_state.texture_filter = true; + // don't filter internal movies + if (current_state.texture_set) + { + VOBJ(texture_set, texture_set, current_state.texture_set); + if (!(VREF(texture_set, ogl.external))) + { + current_state.texture_filter = false; + } + } + internal_set_renderstate(V_NOCULL, 1, game_object); internal_set_renderstate(V_DEPTHTEST, 0, game_object); internal_set_renderstate(V_DEPTHMASK, 0, game_object); diff --git a/src/renderer.cpp b/src/renderer.cpp index 7a15ade9..9bea4cab 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -706,7 +706,7 @@ void Renderer::bindTextures() if (internalState.bIsMovie) flags |= BGFX_SAMPLER_U_CLAMP | BGFX_SAMPLER_V_CLAMP | BGFX_SAMPLER_W_CLAMP; - if (!internalState.bDoTextureFiltering) flags |= BGFX_SAMPLER_MIN_POINT | BGFX_SAMPLER_MAG_POINT | BGFX_SAMPLER_MIP_POINT; + if (!internalState.bDoTextureFiltering || (ff8 && !internalState.bIsExternalTexture)) flags |= BGFX_SAMPLER_MIN_POINT | BGFX_SAMPLER_MAG_POINT | BGFX_SAMPLER_MIP_POINT; } break; case RendererTextureSlot::TEX_S: