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

d3d12: Throw if program failed to build.

Browse source
This commit is contained in:
Vincent Lejeune 2015-12-28 22:57:47 +01:00
parent 8417e21e8d
commit 07f6896622
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
View file

@ -271,12 +271,7 @@ void D3D12GSRender::end()
m_timers.m_vertex_index_duration += std::chrono::duration_cast<std::chrono::microseconds>(vertex_index_duration_end - vertex_index_duration_start).count(); m_timers.m_vertex_index_duration += std::chrono::duration_cast<std::chrono::microseconds>(vertex_index_duration_end - vertex_index_duration_start).count();
std::chrono::time_point<std::chrono::system_clock> program_load_start = std::chrono::system_clock::now(); std::chrono::time_point<std::chrono::system_clock> program_load_start = std::chrono::system_clock::now();
if (!load_program()) load_program();
{
LOG_ERROR(RSX, "LoadProgram failed.");
Emu.Pause();
return;
}
std::chrono::time_point<std::chrono::system_clock> program_load_end = std::chrono::system_clock::now(); std::chrono::time_point<std::chrono::system_clock> program_load_end = std::chrono::system_clock::now();
m_timers.m_program_load_duration += std::chrono::duration_cast<std::chrono::microseconds>(program_load_end - program_load_start).count(); m_timers.m_program_load_duration += std::chrono::duration_cast<std::chrono::microseconds>(program_load_end - program_load_start).count();

2
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
View file

@ -220,7 +220,7 @@ struct D3D12Traits
graphicPipelineStateDesc.IBStripCutValue = pipelineProperties.CutValue; graphicPipelineStateDesc.IBStripCutValue = pipelineProperties.CutValue;
extraData.first->CreateGraphicsPipelineState(&graphicPipelineStateDesc, IID_PPV_ARGS(&std::get<0>(*result))); CHECK_HRESULT(extraData.first->CreateGraphicsPipelineState(&graphicPipelineStateDesc, IID_PPV_ARGS(&std::get<0>(*result))));
std::get<1>(*result) = vertexProgramData.vertex_shader_inputs; std::get<1>(*result) = vertexProgramData.vertex_shader_inputs;
std::wstring name = L"PSO_" + std::to_wstring(vertexProgramData.id) + L"_" + std::to_wstring(fragmentProgramData.id); std::wstring name = L"PSO_" + std::to_wstring(vertexProgramData.id) + L"_" + std::to_wstring(fragmentProgramData.id);