archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 08:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Framebuffer setup fix

Browse source 
- Stencil flag is meaningless if surface does not support stencil
This commit is contained in:
kd-11 2017-12-05 00:33:12 +03:00
parent a2b4cf22b5
commit 69eb483089
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
View file

@ -188,11 +188,12 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk
//NOTE: Z buffers with pitch = 64 are valid even if they would not fit (GT HD Concept) //NOTE: Z buffers with pitch = 64 are valid even if they would not fit (GT HD Concept)
const auto required_color_pitch = std::max<u32>((u32)rsx::utility::get_packed_pitch(surface_format, clip_horizontal), 64u); const auto required_color_pitch = std::max<u32>((u32)rsx::utility::get_packed_pitch(surface_format, clip_horizontal), 64u);
const bool stencil_test_enabled = depth_format == rsx::surface_depth_format::z24s8 && rsx::method_registers.stencil_test_enabled();
if (depth_address) if (depth_address)
{ {
if (!rsx::method_registers.depth_test_enabled() && if (!rsx::method_registers.depth_test_enabled() &&
!rsx::method_registers.stencil_test_enabled() && !stencil_test_enabled &&
target != rsx::surface_target::none) target != rsx::surface_target::none)
{ {
//Disable depth buffer if depth testing is not enabled, unless a clear command is targeting the depth buffer //Disable depth buffer if depth testing is not enabled, unless a clear command is targeting the depth buffer
@ -216,7 +217,7 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk
//TODO: Research clearing both depth AND color //TODO: Research clearing both depth AND color
//TODO: If context is creation_draw, deal with possibility of a lost buffer clear //TODO: If context is creation_draw, deal with possibility of a lost buffer clear
if (context == rsx::framebuffer_creation_context::context_clear_depth || if (context == rsx::framebuffer_creation_context::context_clear_depth ||
rsx::method_registers.depth_test_enabled() || rsx::method_registers.stencil_test_enabled() || rsx::method_registers.depth_test_enabled() || stencil_test_enabled ||
(!rsx::method_registers.color_write_enabled() && rsx::method_registers.depth_write_enabled())) (!rsx::method_registers.color_write_enabled() && rsx::method_registers.depth_write_enabled()))
{ {
// Use address for depth data // Use address for depth data

5
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -2426,11 +2426,12 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
//NOTE: Z buffers with pitch = 64 are valid even if they would not fit (GT HD Concept) //NOTE: Z buffers with pitch = 64 are valid even if they would not fit (GT HD Concept)
const auto required_color_pitch = std::max<u32>((u32)rsx::utility::get_packed_pitch(color_fmt, clip_width), 64u); const auto required_color_pitch = std::max<u32>((u32)rsx::utility::get_packed_pitch(color_fmt, clip_width), 64u);
const bool stencil_test_enabled = depth_fmt == rsx::surface_depth_format::z24s8 && rsx::method_registers.stencil_test_enabled();
if (zeta_address) if (zeta_address)
{ {
if (!rsx::method_registers.depth_test_enabled() && if (!rsx::method_registers.depth_test_enabled() &&
!rsx::method_registers.stencil_test_enabled() && !stencil_test_enabled &&
target != rsx::surface_target::none) target != rsx::surface_target::none)
{ {
//Disable depth buffer if depth testing is not enabled, unless a clear command is targeting the depth buffer //Disable depth buffer if depth testing is not enabled, unless a clear command is targeting the depth buffer
@ -2452,7 +2453,7 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
{ {
LOG_TRACE(RSX, "Framebuffer at 0x%X has aliasing color/depth targets, zeta_pitch = %d, color_pitch=%d", zeta_address, zeta_pitch, surface_pitchs[index]); LOG_TRACE(RSX, "Framebuffer at 0x%X has aliasing color/depth targets, zeta_pitch = %d, color_pitch=%d", zeta_address, zeta_pitch, surface_pitchs[index]);
if (context == rsx::framebuffer_creation_context::context_clear_depth || if (context == rsx::framebuffer_creation_context::context_clear_depth ||
rsx::method_registers.depth_test_enabled() || rsx::method_registers.stencil_test_enabled() || rsx::method_registers.depth_test_enabled() || stencil_test_enabled ||
(!rsx::method_registers.color_write_enabled() && rsx::method_registers.depth_write_enabled())) (!rsx::method_registers.color_write_enabled() && rsx::method_registers.depth_write_enabled()))
{ {
// Use address for depth data // Use address for depth data