Skip to content

Add descriptor type to descriptor uniqueness key. #3692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 31, 2025
Merged

Add descriptor type to descriptor uniqueness key. #3692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b7cd2
Add descriptor type descriptor uniqueness key.
HansKristian-Work Aug 30, 2025
d394696
Fix bad merge for aliased descriptors.
HansKristian-Work Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions renderdoc/driver/vulkan/vk_resources.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,23 +1028,25 @@ DECLARE_REFLECTION_STRUCT(AspectSparseTable);

struct DescriptorUniquenessKey
{
DescriptorUniquenessKey(VkImageLayout layout)
: layout(layout), offset(0), size(0), fmt(VK_FORMAT_UNDEFINED)
DescriptorUniquenessKey(VkImageLayout layout, VkDescriptorType type)
: layout(layout), offset(0), size(0), fmt(VK_FORMAT_UNDEFINED), type(type)
{
}
DescriptorUniquenessKey(uint64_t offset, uint64_t size, VkFormat fmt)
: layout(VK_IMAGE_LAYOUT_UNDEFINED), offset(offset), size(size), fmt(fmt)
DescriptorUniquenessKey(uint64_t offset, uint64_t size, VkFormat fmt, VkDescriptorType type)
: layout(VK_IMAGE_LAYOUT_UNDEFINED), offset(offset), size(size), fmt(fmt), type(type)
{
}

bool operator==(const DescriptorUniquenessKey &key) const
{
return layout == key.layout && offset == key.offset && size == key.size && fmt == key.fmt;
return layout == key.layout && offset == key.offset && size == key.size && fmt == key.fmt &&
type == key.type;
}

VkImageLayout layout;
uint64_t offset, size;
VkFormat fmt;
VkDescriptorType type;
};

namespace std
Expand All @@ -1058,6 +1060,7 @@ struct hash<DescriptorUniquenessKey>
hash ^= std::hash<uint64_t>()(key.offset) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
hash ^= std::hash<uint64_t>()(key.size) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
hash ^= std::hash<uint32_t>()(key.fmt) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
hash ^= std::hash<uint32_t>()(key.type) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
return hash;
}
};
Expand Down
9 changes: 5 additions & 4 deletions renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3452,9 +3452,9 @@ void WrappedVulkan::vkGetDescriptorEXT(VkDevice device, const VkDescriptorGetInf
dstRecord = GetRecord(pDescriptorInfo->data.pSampledImage->imageView);

DescriptorUniquenessKey descKey(
m_IgnoreLayoutForDescriptors
? VK_IMAGE_LAYOUT_UNDEFINED
: pDescriptorInfo->data.pCombinedImageSampler->imageLayout);
m_IgnoreLayoutForDescriptors ? VK_IMAGE_LAYOUT_UNDEFINED
: pDescriptorInfo->data.pCombinedImageSampler->imageLayout,
pDescriptorInfo->type);

// this is internally locked
if(!dstRecord->resInfo->AddDescriptor(descKey))
Expand Down Expand Up @@ -3523,7 +3523,8 @@ void WrappedVulkan::vkGetDescriptorEXT(VkDevice device, const VkDescriptorGetInf

dstRecord = GetResourceManager()->GetResourceRecord(id);

DescriptorUniquenessKey descKey(offs, pDescriptorInfo->data.pUniformBuffer->range, fmt);
DescriptorUniquenessKey descKey(offs, pDescriptorInfo->data.pUniformBuffer->range, fmt,
pDescriptorInfo->type);

// this is internally locked
if(!dstRecord->resInfo->AddDescriptor(descKey))
Expand Down
2 changes: 1 addition & 1 deletion renderdoc/replay/replay_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ void ReplayController::FetchPipelineState(uint32_t eventId)

// if the last range is contiguous with this access, append this access as a new range to query
if(!ranges.empty() && ranges.back().descriptorSize == acc.byteSize &&
ranges.back().offset + ranges.back().descriptorSize == acc.byteOffset &&
ranges.back().offset + ranges.back().count * ranges.back().descriptorSize == acc.byteOffset &&
ranges.back().type == acc.type)
{
ranges.back().count++;
Expand Down