mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-04 05:51:27 +12:00
Merge branch 'master' into mvk-130
This commit is contained in:
commit
eb34a92934
2 changed files with 16 additions and 0 deletions
|
@ -387,6 +387,16 @@ void GLGSRender::load_texture_env()
|
||||||
{
|
{
|
||||||
m_graphics_state |= rsx::fragment_program_state_dirty;
|
m_graphics_state |= rsx::fragment_program_state_dirty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (const auto texture_format = tex.format() & ~(CELL_GCM_TEXTURE_UN | CELL_GCM_TEXTURE_LN);
|
||||||
|
sampler_state->format_class != rsx::classify_format(texture_format) &&
|
||||||
|
(texture_format == CELL_GCM_TEXTURE_A8R8G8B8 || texture_format == CELL_GCM_TEXTURE_D8R8G8B8))
|
||||||
|
{
|
||||||
|
// Depth format redirected to BGRA8 resample stage. Do not filter to avoid bits leaking.
|
||||||
|
// If accurate graphics are desired, force a bitcast to COLOR as a workaround.
|
||||||
|
m_fs_sampler_states[i].set_parameteri(GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||||
|
m_fs_sampler_states[i].set_parameteri(GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -324,6 +324,12 @@ void VKGSRender::load_texture_env()
|
||||||
// Most PS3-like formats can be linearly filtered without problem
|
// Most PS3-like formats can be linearly filtered without problem
|
||||||
can_sample_linear = true;
|
can_sample_linear = true;
|
||||||
}
|
}
|
||||||
|
else if (sampler_state->format_class != rsx::classify_format(texture_format) &&
|
||||||
|
(texture_format == CELL_GCM_TEXTURE_A8R8G8B8 || texture_format == CELL_GCM_TEXTURE_D8R8G8B8))
|
||||||
|
{
|
||||||
|
// Depth format redirected to BGRA8 resample stage. Do not filter to avoid bits leaking
|
||||||
|
can_sample_linear = false;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Not all GPUs support linear filtering of depth formats
|
// Not all GPUs support linear filtering of depth formats
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue