lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-08 23:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vulkan pixel history to handle mesh shaders

Browse Source
This commit is contained in:
baldurk
2023-12-14 13:38:49 +00:00
parent 8759551943
commit 2a255d8a8b
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_pixelhistory.cpp
+13 -10
View File
@@ -827,11 +827,10 @@ protected:
memcpy(stages.data(), pipeCreateInfo.pStages, stages.byteSize());
EventFlags eventFlags = m_pDriver->GetEventFlags(eid);
VkShaderModule replacementShaders[5] = {};
VkShaderModule replacementShaders[NumShaderStages] = {};
// Clean shaders
uint32_t numberOfStages = 5;
for(size_t i = 0; i < numberOfStages; i++)
for(size_t i = 0; i < NumShaderStages; i++)
{
if((eventFlags & PipeStageRWEventFlags(StageFromIndex(i))) != EventFlags::NoFlags)
replacementShaders[i] = m_ShaderCache->GetShaderWithoutSideEffects(
@@ -2434,11 +2433,10 @@ private:
const VulkanCreationInfo::Pipeline &p =
m_pDriver->GetDebugManager()->GetPipelineInfo(basePipeline);
EventFlags eventShaderFlags = m_pDriver->GetEventFlags(eid);
uint32_t numberOfStages = 5;
rdcarray<VkShaderModule> replacementShaders;
replacementShaders.resize(numberOfStages);
replacementShaders.resize(NumShaderStages);
// Replace fragment shader because it might have early fragments
for(size_t i = 0; i < numberOfStages; i++)
for(size_t i = 0; i < replacementShaders.size(); i++)
{
if(p.shaders[i].module == ResourceId())
continue;
@@ -3104,11 +3102,10 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback
memcpy(stages.data(), pipeCreateInfo.pStages, stages.byteSize());
EventFlags eventFlags = m_pDriver->GetEventFlags(eid);
VkShaderModule replacementShaders[5] = {};
VkShaderModule replacementShaders[NumShaderStages] = {};
// Clean shaders
uint32_t numberOfStages = 5;
for(size_t i = 0; i < numberOfStages; i++)
for(size_t i = 0; i < NumShaderStages; i++)
{
if((eventFlags & PipeStageRWEventFlags(StageFromIndex(i))) != EventFlags::NoFlags)
replacementShaders[i] = m_ShaderCache->GetShaderWithoutSideEffects(
@@ -3199,6 +3196,7 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback
stageCI.module = m_ShaderCache->GetPrimitiveIdShader(colorOutputIndex);
stageCI.pName = "main";
bool gsFound = false;
bool meshFound = false;
bool fsFound = false;
for(uint32_t i = 0; i < pipeCreateInfo.stageCount; i++)
{
@@ -3207,6 +3205,11 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback
gsFound = true;
break;
}
if(stages[i].stage == VK_SHADER_STAGE_MESH_BIT_EXT)
{
meshFound = true;
break;
}
if(stages[i].stage == VK_SHADER_STAGE_FRAGMENT_BIT)
{
stages[i] = stageCI;
@@ -3220,7 +3223,7 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback
pipeCreateInfo.pStages = stages.data();
}
if(!gsFound)
if(!gsFound && !meshFound)
{
vkr = m_pDriver->vkCreateGraphicsPipelines(m_pDriver->GetDev(), VK_NULL_HANDLE, 1,
&pipeCreateInfo, NULL, &pipes.primitiveIdPipe);