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

Ensure descriptors are cleanly serialised and initialised for all types

Browse Source
This commit is contained in:
baldurk
2025-01-16 19:43:20 +00:00
parent e8abd693c6
commit 7840000d24
1 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_serialise.cpp
+39 -8
View File
@@ -5367,15 +5367,22 @@ void DoSerialise(SerialiserType &ser, DescriptorSetSlot &el)
// mutable descriptor path
// serialise the type as VkDescriptorType
VkDescriptorType type = convert(el.type);
VkDescriptorType type;
if(ser.IsWriting())
type = convert(el.type);
SERIALISE_ELEMENT(type);
el.type = convert(type);
if(ser.IsReading())
el.type = convert(type);
// serialise sampler, if the type needs it
if(el.type == DescriptorSlotType::Sampler || el.type == DescriptorSlotType::CombinedImageSampler)
{
SERIALISE_MEMBER(sampler);
}
else if(ser.IsReading())
{
el.sampler = ResourceId();
}
// almost all types have a resource, serialise that
if(el.type != DescriptorSlotType::Unwritten && el.type != DescriptorSlotType::InlineBlock &&
@@ -5383,15 +5390,26 @@ void DoSerialise(SerialiserType &ser, DescriptorSetSlot &el)
{
SERIALISE_MEMBER(resource);
}
else if(ser.IsReading())
{
el.resource = ResourceId();
}
// serialise image layout, for image types
if(el.type == DescriptorSlotType::CombinedImageSampler ||
el.type == DescriptorSlotType::SampledImage || el.type == DescriptorSlotType::StorageImage ||
el.type == DescriptorSlotType::InputAttachment)
{
VkImageLayout imageLayout = convert(el.imageLayout);
VkImageLayout imageLayout;
if(ser.IsWriting())
imageLayout = convert(el.imageLayout);
SERIALISE_ELEMENT(imageLayout);
el.imageLayout = convert(imageLayout);
if(ser.IsReading())
el.imageLayout = convert(imageLayout);
}
else if(ser.IsReading())
{
el.imageLayout = DescriptorSlotImageLayout::Undefined;
}
// serialise buffer range, for buffer types and inline block
@@ -5401,12 +5419,25 @@ void DoSerialise(SerialiserType &ser, DescriptorSetSlot &el)
el.type == DescriptorSlotType::StorageBufferDynamic ||
el.type == DescriptorSlotType::InlineBlock)
{
VkDeviceSize offset = el.offset;
VkDeviceSize range = el.GetRange();
VkDeviceSize offset;
VkDeviceSize range;
if(ser.IsWriting())
{
offset = el.offset;
range = el.GetRange();
}
SERIALISE_ELEMENT(offset).OffsetOrSize();
SERIALISE_ELEMENT(range).OffsetOrSize();
el.offset = offset;
el.range = range;
if(ser.IsReading())
{
el.offset = offset;
el.range = range;
}
}
else if(ser.IsReading())
{
el.offset = 0;
el.range = 0;
}
}
else