lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 04:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use flags from final linked pipeline with EXT_gpl if present

Browse Source
This commit is contained in:
baldurk
2025-04-07 16:49:00 +01:00
parent 26f2732268
commit 3a3e2c0540
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_info.cpp
+1 -1
View File
@@ -1097,7 +1097,7 @@ void VulkanCreationInfo::Pipeline::Init(VulkanResourceManager *resourceMan,
if(graphicsLibraryCreate)
availStages = graphicsLibraryCreate->flags;
vertLayout = fragLayout = GetResID(pCreateInfo->layout);
ownLayout = vertLayout = fragLayout = GetResID(pCreateInfo->layout);
renderpass = GetResID(pCreateInfo->renderPass);
subpass = pCreateInfo->subpass;
renderdoc/driver/vulkan/vk_info.h
+4
View File
@@ -269,6 +269,10 @@ struct VulkanCreationInfo
ResourceId compLayout;
// the pipeline's own specified layout, independent of vertLayout/fragLayout below when linking
// graphics pipeline libraries
ResourceId ownLayout;
// these will be the same in some cases, but can be different if the application is using
// INDEPENDENT_SETS_BIT_KHR
ResourceId vertLayout;
renderdoc/driver/vulkan/vk_shader_cache.cpp
+3 -1
View File
@@ -977,7 +977,9 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p
// don't have to handle separate vert/frag layouts as push constant ranges must be identical
const VulkanCreationInfo::PipelineLayout &pipeLayoutInfo =
m_pDriver->m_CreationInfo.m_PipelineLayout[pipeInfo.vertLayout];
m_pDriver->m_CreationInfo
.m_PipelineLayout[pipeInfo.ownLayout != ResourceId() ? pipeInfo.ownLayout
: pipeInfo.vertLayout];
const rdcarray<VkPushConstantRange> &push = pipeLayoutInfo.pushRanges;
VkPipelineLayoutCreateInfo pipeLayoutCreateInfo = {