diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h index 532efd688..430f07538 100644 --- a/renderdoc/driver/vulkan/vk_common.h +++ b/renderdoc/driver/vulkan/vk_common.h @@ -746,4 +746,7 @@ DECLARE_REFLECTION_ENUM(VkSamplerReductionModeEXT); DECLARE_REFLECTION_ENUM(VkSamplerYcbcrModelConversionKHR); DECLARE_REFLECTION_ENUM(VkSamplerYcbcrRangeKHR); DECLARE_REFLECTION_ENUM(VkChromaLocation); -DECLARE_REFLECTION_ENUM(VkDeviceQueueCreateFlagBits); \ No newline at end of file +DECLARE_REFLECTION_ENUM(VkDeviceQueueCreateFlagBits); +DECLARE_REFLECTION_ENUM(VkSubpassDescriptionFlagBits); +DECLARE_REFLECTION_ENUM(VkDescriptorSetLayoutCreateFlagBits); +DECLARE_REFLECTION_ENUM(VkSwapchainCreateFlagBitsKHR); \ No newline at end of file diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index 133d5b109..811f06e8a 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -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 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); diff --git a/renderdoc/driver/vulkan/vk_stringise.cpp b/renderdoc/driver/vulkan/vk_stringise.cpp index 97b8b5fcd..cb8309727 100644 --- a/renderdoc/driver/vulkan/vk_stringise.cpp +++ b/renderdoc/driver/vulkan/vk_stringise.cpp @@ -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) {