Skip to content

Commit

Permalink
more changes to hopefully get this pull request through.
Browse files Browse the repository at this point in the history
  • Loading branch information
zaphod77 committed Dec 16, 2024
1 parent 6448a50 commit 1446f1b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions src/gl/gl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 1446f1b

Please sign in to comment.