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

d3d12: fix invalid framebuffer crash and shader compile

Browse source
This commit is contained in:
Jake 2018-01-11 07:11:28 -06:00 • committed by kd-11
parent ac53fc54dc
commit c5074ba81f
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/D3D12/D3D12CommonDecompiler.cpp
View file

@ -83,7 +83,7 @@ std::string getFunctionImp(FUNCTION f)
case FUNCTION::FUNCTION_DFDY: case FUNCTION::FUNCTION_DFDY:
return "ddy($0)"; return "ddy($0)";
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA: case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_DEPTH_RGBA:
return "texture2DReconstruct($t.Sample($tsampler, $0.xy * $t_scale, texture_parameters[$_i].z))"; return "texture2DReconstruct($t.Sample($tsampler, $0.xy * $t_scale), texture_parameters[$_i].z)";
} }
} }

6
rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp
View file

@ -103,11 +103,15 @@ namespace
void D3D12GSRender::clear_surface(u32 arg) void D3D12GSRender::clear_surface(u32 arg)
{ {
if ((arg & 0xf3) == 0) return;
std::chrono::time_point<steady_clock> start_duration = steady_clock::now(); std::chrono::time_point<steady_clock> start_duration = steady_clock::now();
std::chrono::time_point<steady_clock> rtt_duration_start = steady_clock::now(); std::chrono::time_point<steady_clock> rtt_duration_start = steady_clock::now();
prepare_render_targets(get_current_resource_storage().command_list.Get()); prepare_render_targets(get_current_resource_storage().command_list.Get());
if (!framebuffer_status_valid) return;
std::chrono::time_point<steady_clock> rtt_duration_end = steady_clock::now(); std::chrono::time_point<steady_clock> rtt_duration_end = steady_clock::now();
m_timers.prepare_rtt_duration += std::chrono::duration_cast<std::chrono::microseconds>(rtt_duration_end - rtt_duration_start).count(); m_timers.prepare_rtt_duration += std::chrono::duration_cast<std::chrono::microseconds>(rtt_duration_end - rtt_duration_start).count();
@ -186,6 +190,8 @@ void D3D12GSRender::prepare_render_targets(ID3D12GraphicsCommandList *copycmdlis
get_color_surface_addresses(), get_zeta_surface_address(), get_color_surface_addresses(), get_zeta_surface_address(),
m_device.Get(), clear_color, 1.f, 0); m_device.Get(), clear_color, 1.f, 0);
framebuffer_status_valid = true;
// write descriptors // write descriptors
DXGI_FORMAT dxgi_format = get_color_surface_format(rsx::method_registers.surface_color()); DXGI_FORMAT dxgi_format = get_color_surface_format(rsx::method_registers.surface_color());
D3D12_RENDER_TARGET_VIEW_DESC rtt_view_desc = {}; D3D12_RENDER_TARGET_VIEW_DESC rtt_view_desc = {};