ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rsx: Fixes for framebuffer setup code

This commit is contained in:
kd-11 2017-11-25 12:13:06 +03:00
parent ddebc334bf
commit 3350e7ee55
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
View File

@ -184,9 +184,10 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk
const auto zeta_pitch = rsx::method_registers.surface_z_pitch(); const auto zeta_pitch = rsx::method_registers.surface_z_pitch();
const auto surface_format = rsx::method_registers.surface_color(); const auto surface_format = rsx::method_registers.surface_color();
const auto depth_format = rsx::method_registers.surface_depth_fmt(); const auto depth_format = rsx::method_registers.surface_depth_fmt();
const auto target = rsx::method_registers.surface_color_target();
const auto required_z_pitch = depth_format == rsx::surface_depth_format::z16 ? clip_horizontal * 2 : clip_horizontal * 4; const auto required_z_pitch = depth_format == rsx::surface_depth_format::z16 ? clip_horizontal * 2u : clip_horizontal * 4u;
const auto required_color_pitch = std::max<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);
if (depth_address) if (depth_address)
{ {
@ -195,7 +196,7 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk
{ {
depth_address = 0; depth_address = 0;
} }
else if (!rsx::method_registers.depth_test_enabled()) else if (!rsx::method_registers.depth_test_enabled() && 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
const bool is_depth_clear = !!(context & rsx::framebuffer_creation_context::context_clear_depth); const bool is_depth_clear = !!(context & rsx::framebuffer_creation_context::context_clear_depth);
@ -207,16 +208,7 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk
} }
} }
for (const auto &addr : surface_addresses) for (const auto &index : rsx::utility::get_rtt_indexes(target))
{
if (addr)
{
framebuffer_status_valid = true;
break;
}
}
for (const auto &index : rsx::utility::get_rtt_indexes(rsx::method_registers.surface_color_target()))
{ {
if (pitchs[index] < required_color_pitch) if (pitchs[index] < required_color_pitch)
surface_addresses[index] = 0; surface_addresses[index] = 0;
@ -242,14 +234,16 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk
break; break;
} }
} }
if (surface_addresses[index])
framebuffer_status_valid = true;
} }
if (!framebuffer_status_valid && !depth_address) if (!framebuffer_status_valid && !depth_address)
return; return;
m_rtts.prepare_render_target(nullptr, surface_format, depth_format, clip_horizontal, clip_vertical, m_rtts.prepare_render_target(nullptr, surface_format, depth_format, clip_horizontal, clip_vertical,
rsx::method_registers.surface_color_target(), target, surface_addresses, depth_address);
surface_addresses, depth_address);
draw_fbo.recreate(); draw_fbo.recreate();

23
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View File

@ -2420,9 +2420,10 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
const auto color_fmt = rsx::method_registers.surface_color(); const auto color_fmt = rsx::method_registers.surface_color();
const auto depth_fmt = rsx::method_registers.surface_depth_fmt(); const auto depth_fmt = rsx::method_registers.surface_depth_fmt();
const auto target = rsx::method_registers.surface_color_target();
const auto required_z_pitch = depth_fmt == rsx::surface_depth_format::z16 ? clip_width * 2 : clip_width * 4; const auto required_z_pitch = depth_fmt == rsx::surface_depth_format::z16 ? clip_width * 2 : clip_width * 4;
const auto required_color_pitch = std::max<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);
if (zeta_address) if (zeta_address)
{ {
@ -2431,7 +2432,7 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
{ {
zeta_address = 0; zeta_address = 0;
} }
else if (!rsx::method_registers.depth_test_enabled()) else if (!rsx::method_registers.depth_test_enabled() && 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
const bool is_depth_clear = !!(context & rsx::framebuffer_creation_context::context_clear_depth); const bool is_depth_clear = !!(context & rsx::framebuffer_creation_context::context_clear_depth);
@ -2443,16 +2444,7 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
} }
} }
for (const auto &addr: surface_addresses) for (const auto &index : rsx::utility::get_rtt_indexes(target))
{
if (addr)
{
framebuffer_status_valid = true;
break;
}
}
for (const auto &index : rsx::utility::get_rtt_indexes(rsx::method_registers.surface_color_target()))
{ {
if (surface_pitchs[index] < required_color_pitch) if (surface_pitchs[index] < required_color_pitch)
surface_addresses[index] = 0; surface_addresses[index] = 0;
@ -2477,6 +2469,9 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
break; break;
} }
} }
if (surface_addresses[index])
framebuffer_status_valid = true;
} }
if (!framebuffer_status_valid && !zeta_address) if (!framebuffer_status_valid && !zeta_address)
@ -2519,7 +2514,7 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
m_rtts.prepare_render_target(&*m_current_command_buffer, m_rtts.prepare_render_target(&*m_current_command_buffer,
color_fmt, depth_fmt, color_fmt, depth_fmt,
clip_width, clip_height, clip_width, clip_height,
rsx::method_registers.surface_color_target(), target,
surface_addresses, zeta_address, surface_addresses, zeta_address,
(*m_device), &*m_current_command_buffer, m_optimal_tiling_supported_formats, m_memory_type_mapping); (*m_device), &*m_current_command_buffer, m_optimal_tiling_supported_formats, m_memory_type_mapping);
@ -2549,7 +2544,7 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
m_depth_surface_info.depth_format = depth_fmt; m_depth_surface_info.depth_format = depth_fmt;
//Bind created rtts as current fbo... //Bind created rtts as current fbo...
std::vector<u8> draw_buffers = rsx::utility::get_rtt_indexes(rsx::method_registers.surface_color_target()); std::vector<u8> draw_buffers = rsx::utility::get_rtt_indexes(target);
m_draw_buffers_count = 0; m_draw_buffers_count = 0;
std::vector<vk::image*> bound_images; std::vector<vk::image*> bound_images;