From 224facf3ba654bf67ef7f925787249769d3eaa05 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Wed, 13 Jan 2016 00:36:39 +0100 Subject: [PATCH] d3d12: Never pass nullptr as render target descriptor, even if unused. Function interface doesn't allow this. --- rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp index bdc74f8ed7..ea6a80a57f 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp @@ -257,9 +257,8 @@ void D3D12GSRender::prepare_render_targets(ID3D12GraphicsCommandList *copycmdlis void D3D12GSRender::set_rtt_and_ds(ID3D12GraphicsCommandList *command_list) { UINT num_rtt = get_num_rtt(to_surface_target(rsx::method_registers[NV4097_SET_SURFACE_COLOR_TARGET])); - D3D12_CPU_DESCRIPTOR_HANDLE* rtt_handle = (num_rtt > 0) ? &m_rtts.current_rtts_handle : nullptr; D3D12_CPU_DESCRIPTOR_HANDLE* ds_handle = (std::get<1>(m_rtts.m_bound_depth_stencil) != nullptr) ? &m_rtts.current_ds_handle : nullptr; - command_list->OMSetRenderTargets((UINT)num_rtt, rtt_handle, true, ds_handle); + command_list->OMSetRenderTargets((UINT)num_rtt, &m_rtts.current_rtts_handle, true, ds_handle); } void render_targets::init(ID3D12Device *device)