From fa94794b093ac51b778bd2e60e1801eff63e7f91 Mon Sep 17 00:00:00 2001 From: Janos Pantos Date: Thu, 7 Sep 2017 19:01:54 +0200 Subject: [PATCH] Fix remote replay issue caused by 9b4ee72. Refs #735 --- renderdoc/core/replay_proxy.cpp | 73 +++++++++++++++++---------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp index a21f8f21a..d4029abd6 100644 --- a/renderdoc/core/replay_proxy.cpp +++ b/renderdoc/core/replay_proxy.cpp @@ -2489,49 +2489,52 @@ void ReplayProxy::SavePipelineState() m_FromReplaySerialiser->Serialise("", m_GLPipelineState); m_FromReplaySerialiser->Serialise("", m_VulkanPipelineState); + if(!m_RemoteServer) { - D3D11Pipe::Shader *stages[] = { - &m_D3D11PipelineState.m_VS, &m_D3D11PipelineState.m_HS, &m_D3D11PipelineState.m_DS, - &m_D3D11PipelineState.m_GS, &m_D3D11PipelineState.m_PS, &m_D3D11PipelineState.m_CS, - }; + { + D3D11Pipe::Shader *stages[] = { + &m_D3D11PipelineState.m_VS, &m_D3D11PipelineState.m_HS, &m_D3D11PipelineState.m_DS, + &m_D3D11PipelineState.m_GS, &m_D3D11PipelineState.m_PS, &m_D3D11PipelineState.m_CS, + }; - for(int i = 0; i < 6; i++) - if(stages[i]->Object != ResourceId()) - stages[i]->ShaderDetails = GetShader(GetLiveID(stages[i]->Object), ""); - } + for(int i = 0; i < 6; i++) + if(stages[i]->Object != ResourceId()) + stages[i]->ShaderDetails = GetShader(GetLiveID(stages[i]->Object), ""); + } - { - D3D12Pipe::Shader *stages[] = { - &m_D3D12PipelineState.m_VS, &m_D3D12PipelineState.m_HS, &m_D3D12PipelineState.m_DS, - &m_D3D12PipelineState.m_GS, &m_D3D12PipelineState.m_PS, &m_D3D12PipelineState.m_CS, - }; + { + D3D12Pipe::Shader *stages[] = { + &m_D3D12PipelineState.m_VS, &m_D3D12PipelineState.m_HS, &m_D3D12PipelineState.m_DS, + &m_D3D12PipelineState.m_GS, &m_D3D12PipelineState.m_PS, &m_D3D12PipelineState.m_CS, + }; - for(int i = 0; i < 6; i++) - if(stages[i]->Object != ResourceId()) - stages[i]->ShaderDetails = GetShader(GetLiveID(stages[i]->Object), ""); - } + for(int i = 0; i < 6; i++) + if(stages[i]->Object != ResourceId()) + stages[i]->ShaderDetails = GetShader(GetLiveID(stages[i]->Object), ""); + } - { - GLPipe::Shader *stages[] = { - &m_GLPipelineState.m_VS, &m_GLPipelineState.m_TCS, &m_GLPipelineState.m_TES, - &m_GLPipelineState.m_GS, &m_GLPipelineState.m_FS, &m_GLPipelineState.m_CS, - }; + { + GLPipe::Shader *stages[] = { + &m_GLPipelineState.m_VS, &m_GLPipelineState.m_TCS, &m_GLPipelineState.m_TES, + &m_GLPipelineState.m_GS, &m_GLPipelineState.m_FS, &m_GLPipelineState.m_CS, + }; - for(int i = 0; i < 6; i++) - if(stages[i]->Object != ResourceId()) - stages[i]->ShaderDetails = GetShader(GetLiveID(stages[i]->Object), ""); - } + for(int i = 0; i < 6; i++) + if(stages[i]->Object != ResourceId()) + stages[i]->ShaderDetails = GetShader(GetLiveID(stages[i]->Object), ""); + } - { - VKPipe::Shader *stages[] = { - &m_VulkanPipelineState.m_VS, &m_VulkanPipelineState.m_TCS, &m_VulkanPipelineState.m_TES, - &m_VulkanPipelineState.m_GS, &m_VulkanPipelineState.m_FS, &m_VulkanPipelineState.m_CS, - }; + { + VKPipe::Shader *stages[] = { + &m_VulkanPipelineState.m_VS, &m_VulkanPipelineState.m_TCS, &m_VulkanPipelineState.m_TES, + &m_VulkanPipelineState.m_GS, &m_VulkanPipelineState.m_FS, &m_VulkanPipelineState.m_CS, + }; - for(int i = 0; i < 6; i++) - if(stages[i]->Object != ResourceId()) - stages[i]->ShaderDetails = - GetShader(GetLiveID(stages[i]->Object), stages[i]->entryPoint.elems); + for(int i = 0; i < 6; i++) + if(stages[i]->Object != ResourceId()) + stages[i]->ShaderDetails = + GetShader(GetLiveID(stages[i]->Object), stages[i]->entryPoint.elems); + } } }