From 2498f7f0fdd6391ce0b95a6c7eb69e0955e5d4e0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 26 Apr 2019 15:33:24 +0100 Subject: [PATCH] Fix fetching array outputs from vertex shaders * This broke when fixing array outputs from tessellation/geometry shaders! --- renderdoc/driver/shaders/spirv/spirv_common.h | 5 +++++ renderdoc/driver/shaders/spirv/spirv_disassemble.cpp | 5 ++++- renderdoc/driver/vulkan/vk_postvs.cpp | 9 +++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/shaders/spirv/spirv_common.h b/renderdoc/driver/shaders/spirv/spirv_common.h index 50e9c518e..a5d91a4c9 100644 --- a/renderdoc/driver/shaders/spirv/spirv_common.h +++ b/renderdoc/driver/shaders/spirv/spirv_common.h @@ -94,6 +94,11 @@ struct SPIRVPatchData // is this input/output part of a matrix bool isMatrix = false; + + // this is an element of an array that's been exploded after [0]. + // i.e. this is false for non-arrays, and false for element [0] in an array, then true for + // elements [1], [2], [3], etc.. + bool isArraySubsequentElement = false; }; // matches the input/output signature array, with details of where to fetch the output from in the diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp index 965dad80a..eceff3f53 100644 --- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp @@ -4104,7 +4104,10 @@ void AddSignatureParameter(bool isInput, ShaderStage stage, uint32_t id, uint32_ sig.regIndex += RDCMAX(1U, type->matrixSize); if(isArray) - patch.ID = patch.structID = 0; + { + patch.accessChain.back()++; + patch.isArraySubsequentElement = true; + } } } diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp index 15116ce6b..1e1a38923 100644 --- a/renderdoc/driver/vulkan/vk_postvs.cpp +++ b/renderdoc/driver/vulkan/vk_postvs.cpp @@ -1241,7 +1241,11 @@ static void AddXFBAnnotations(const ShaderReflection &refl, const SPIRVPatchData for(size_t i = 0; i < outsig.size(); i++) { - if(outpatch[i].structID && !outpatch[i].accessChain.empty()) + if(outpatch[i].isArraySubsequentElement) + { + // do not patch anything as we only patch the base array, but reserve space in the stride + } + else if(outpatch[i].structID && !outpatch[i].accessChain.empty()) { editor.AddDecoration(SPIRVOperation( spv::OpMemberDecorate, @@ -1265,7 +1269,8 @@ static void AddXFBAnnotations(const ShaderReflection &refl, const SPIRVPatchData for(size_t i = 0; i < outpatch.size(); i++) { - if(outpatch[i].ID && vars.find(outpatch[i].ID) == vars.end()) + if(outpatch[i].ID && !outpatch[i].isArraySubsequentElement && + vars.find(outpatch[i].ID) == vars.end()) { editor.AddDecoration( SPIRVOperation(spv::OpDecorate, {outpatch[i].ID, (uint32_t)spv::DecorationXfbBuffer, 0}));