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

Add stringification for new bits in vulkan flag enums that had no bits

Browse Source
This commit is contained in:
baldurk
2018-04-30 19:07:40 +01:00
parent deab822e30
commit b7ab28a2c4
3 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_common.h
+4 -1
View File
@@ -746,4 +746,7 @@ DECLARE_REFLECTION_ENUM(VkSamplerReductionModeEXT);
DECLARE_REFLECTION_ENUM(VkSamplerYcbcrModelConversionKHR);
DECLARE_REFLECTION_ENUM(VkSamplerYcbcrRangeKHR);
DECLARE_REFLECTION_ENUM(VkChromaLocation);
DECLARE_REFLECTION_ENUM(VkDeviceQueueCreateFlagBits);
DECLARE_REFLECTION_ENUM(VkDeviceQueueCreateFlagBits);
DECLARE_REFLECTION_ENUM(VkSubpassDescriptionFlagBits);
DECLARE_REFLECTION_ENUM(VkDescriptorSetLayoutCreateFlagBits);
DECLARE_REFLECTION_ENUM(VkSwapchainCreateFlagBitsKHR);
renderdoc/driver/vulkan/vk_serialise.cpp
+4 -4
View File
@@ -357,7 +357,7 @@ void DoSerialise(SerialiserType &ser, VkDeviceQueueCreateInfo &el)
RDCWARN("sType not set properly: %u", el.sType);
SerialiseNext(ser, el.sType, el.pNext);
SERIALISE_MEMBER_TYPED(VkFlagWithNoBits, flags);
SERIALISE_MEMBER_TYPED(VkDeviceQueueCreateFlagBits, flags);
SERIALISE_MEMBER(queueFamilyIndex);
SERIALISE_MEMBER(queueCount);
SERIALISE_MEMBER_ARRAY(pQueuePriorities, queueCount);
@@ -906,7 +906,7 @@ void DoSerialise(SerialiserType &ser, VkAttachmentDescription &el)
template <typename SerialiserType>
void DoSerialise(SerialiserType &ser, VkSubpassDescription &el)
{
SERIALISE_MEMBER_TYPED(VkFlagWithNoBits, flags);
SERIALISE_MEMBER_TYPED(VkSubpassDescriptionFlagBits, flags);
SERIALISE_MEMBER(pipelineBindPoint);
SERIALISE_MEMBER(inputAttachmentCount);
@@ -1908,7 +1908,7 @@ void DoSerialise(SerialiserType &ser, VkDescriptorSetLayoutCreateInfo &el)
RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO);
SerialiseNext(ser, el.sType, el.pNext);
SERIALISE_MEMBER_TYPED(VkFlagWithNoBits, flags);
SERIALISE_MEMBER_TYPED(VkDescriptorSetLayoutCreateFlagBits, flags);
SERIALISE_MEMBER(bindingCount);
SERIALISE_MEMBER_ARRAY(pBindings, bindingCount);
}
@@ -2089,7 +2089,7 @@ void DoSerialise(SerialiserType &ser, VkSwapchainCreateInfoKHR &el)
RDCASSERT(ser.IsReading() || el.sType == VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR);
SerialiseNext(ser, el.sType, el.pNext);
SERIALISE_MEMBER_TYPED(VkFlagWithNoBits, flags);
SERIALISE_MEMBER_TYPED(VkSwapchainCreateFlagBitsKHR, flags);
// don't need the surface
SERIALISE_MEMBER_EMPTY(surface);
renderdoc/driver/vulkan/vk_stringise.cpp
+33
View File
@@ -1781,6 +1781,39 @@ std::string DoStringise(const VkDeviceQueueCreateFlagBits &el)
END_ENUM_STRINGISE();
}
template <>
std::string DoStringise(const VkSubpassDescriptionFlagBits &el)
{
BEGIN_ENUM_STRINGISE(VkSubpassDescriptionFlagBits);
{
STRINGISE_ENUM(VK_SUBPASS_DESCRIPTION_PER_VIEW_ATTRIBUTES_BIT_NVX)
STRINGISE_ENUM(VK_SUBPASS_DESCRIPTION_PER_VIEW_POSITION_X_ONLY_BIT_NVX)
}
END_ENUM_STRINGISE();
}
template <>
std::string DoStringise(const VkDescriptorSetLayoutCreateFlagBits &el)
{
BEGIN_ENUM_STRINGISE(VkDescriptorSetLayoutCreateFlagBits);
{
STRINGISE_ENUM(VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)
STRINGISE_ENUM(VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT)
}
END_ENUM_STRINGISE();
}
template <>
std::string DoStringise(const VkSwapchainCreateFlagBitsKHR &el)
{
BEGIN_ENUM_STRINGISE(VkSwapchainCreateFlagBitsKHR);
{
STRINGISE_ENUM(VK_SWAPCHAIN_CREATE_PROTECTED_BIT_KHR)
STRINGISE_ENUM(VK_SWAPCHAIN_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR)
}
END_ENUM_STRINGISE();
}
template <>
std::string DoStringise(const VkExtent3D &el)
{