lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-01 04:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle sparsely-defined descriptor set layouts (Refs #176)

Browse Source
This commit is contained in:
baldurk
2016-02-18 17:32:51 +01:00
parent a15dcb4ded
commit 144a91ea97
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_info.cpp
+21 -9
View File
@@ -29,29 +29,41 @@ void DescSetLayout::Init(VulkanResourceManager *resourceMan, VulkanCreationInfo
{
dynamicCount = 0;
// descriptor set layouts can be sparse, such that only three bindings exist
// but they are at 0, 5 and 10.
// We assume here that while the layouts may be sparse that's mostly to allow
// multiple layouts to co-exist nicely, and that we can allocate our bindings
// array to cover the whole size, and leave some elements unused.
// will be at least this size.
bindings.resize(pCreateInfo->bindingCount);
for(uint32_t i=0; i < pCreateInfo->bindingCount; i++)
{
bindings[i].descriptorCount = pCreateInfo->pBindings[i].descriptorCount;
bindings[i].descriptorType = pCreateInfo->pBindings[i].descriptorType;
bindings[i].stageFlags = pCreateInfo->pBindings[i].stageFlags;
uint32_t b = pCreateInfo->pBindings[i].binding;
// expand to fit the binding
if(b >= bindings.size())
bindings.resize(b+1);
if(bindings[i].descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC ||
bindings[i].descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
bindings[b].descriptorCount = pCreateInfo->pBindings[i].descriptorCount;
bindings[b].descriptorType = pCreateInfo->pBindings[i].descriptorType;
bindings[b].stageFlags = pCreateInfo->pBindings[i].stageFlags;
if(bindings[b].descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC ||
bindings[b].descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
dynamicCount++;
if(pCreateInfo->pBindings[i].pImmutableSamplers)
{
bindings[i].immutableSampler = new ResourceId[bindings[i].descriptorCount];
bindings[b].immutableSampler = new ResourceId[bindings[i].descriptorCount];
for(uint32_t s=0; s < bindings[i].descriptorCount; s++)
for(uint32_t s=0; s < bindings[b].descriptorCount; s++)
{
// during writing, the create info contains the *wrapped* objects.
// on replay, we have the wrapper map so we can look it up
if(resourceMan->IsWriting())
bindings[i].immutableSampler[s] = GetResID(pCreateInfo->pBindings[i].pImmutableSamplers[s]);
bindings[b].immutableSampler[s] = GetResID(pCreateInfo->pBindings[i].pImmutableSamplers[s]);
else
bindings[i].immutableSampler[s] = resourceMan->GetNonDispWrapper(pCreateInfo->pBindings[i].pImmutableSamplers[s])->id;
bindings[b].immutableSampler[s] = resourceMan->GetNonDispWrapper(pCreateInfo->pBindings[i].pImmutableSamplers[s])->id;
}
}
}
renderdoc/driver/vulkan/vk_info.h
+6 -1
View File
@@ -39,7 +39,12 @@ struct DescSetLayout
struct Binding
{
Binding() : immutableSampler(NULL) {}
// set reasonable defaults in the constructor as with sparse descriptor set layouts
// some elements could be untouched. We set stageFlags to 0 so the UI ignores these
// elements
Binding()
: descriptorType(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER), descriptorCount(1)
, stageFlags(0), immutableSampler(NULL) {}
~Binding() { SAFE_DELETE_ARRAY(immutableSampler); }
VkDescriptorType descriptorType;