From e56166838c9882eb44eeddfee2331c450e5b443d Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 14 Jan 2019 14:53:00 +0000 Subject: [PATCH] Sort some enum lists that were unsorted --- renderdoc/driver/vulkan/vk_common.h | 34 ++--- renderdoc/driver/vulkan/vk_serialise.cpp | 158 +++++++++++------------ 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h index 692c8c149..324ef602d 100644 --- a/renderdoc/driver/vulkan/vk_common.h +++ b/renderdoc/driver/vulkan/vk_common.h @@ -1076,7 +1076,6 @@ DECLARE_DESERIALISE_TYPE(VkWin32KeyedMutexAcquireReleaseInfoNV); // enums -DECLARE_REFLECTION_ENUM(VkFlagWithNoBits); DECLARE_REFLECTION_ENUM(VkAccessFlagBits); DECLARE_REFLECTION_ENUM(VkAttachmentDescriptionFlagBits); DECLARE_REFLECTION_ENUM(VkAttachmentLoadOp); @@ -1107,16 +1106,27 @@ DECLARE_REFLECTION_ENUM(VkDescriptorPoolCreateFlagBits); DECLARE_REFLECTION_ENUM(VkDescriptorSetLayoutCreateFlagBits); DECLARE_REFLECTION_ENUM(VkDescriptorType); DECLARE_REFLECTION_ENUM(VkDescriptorUpdateTemplateType); +DECLARE_REFLECTION_ENUM(VkDeviceEventTypeEXT); DECLARE_REFLECTION_ENUM(VkDeviceGroupPresentModeFlagBitsKHR); DECLARE_REFLECTION_ENUM(VkDeviceQueueCreateFlagBits); +DECLARE_REFLECTION_ENUM(VkDisplayEventTypeEXT); +DECLARE_REFLECTION_ENUM(VkDisplayPlaneAlphaFlagBitsKHR); +DECLARE_REFLECTION_ENUM(VkDisplayPowerStateEXT); +DECLARE_REFLECTION_ENUM(VkDriverIdKHR); DECLARE_REFLECTION_ENUM(VkDynamicState); +DECLARE_REFLECTION_ENUM(VkExternalFenceFeatureFlagBits); DECLARE_REFLECTION_ENUM(VkExternalFenceHandleTypeFlagBits); +DECLARE_REFLECTION_ENUM(VkExternalMemoryFeatureFlagBits); DECLARE_REFLECTION_ENUM(VkExternalMemoryHandleTypeFlagBits); DECLARE_REFLECTION_ENUM(VkExternalMemoryHandleTypeFlagBitsNV); +DECLARE_REFLECTION_ENUM(VkExternalSemaphoreFeatureFlagBits); DECLARE_REFLECTION_ENUM(VkExternalSemaphoreHandleTypeFlagBits); DECLARE_REFLECTION_ENUM(VkFenceCreateFlagBits); +DECLARE_REFLECTION_ENUM(VkFenceImportFlagBits); DECLARE_REFLECTION_ENUM(VkFilter); +DECLARE_REFLECTION_ENUM(VkFlagWithNoBits); DECLARE_REFLECTION_ENUM(VkFormat); +DECLARE_REFLECTION_ENUM(VkFormatFeatureFlagBits); DECLARE_REFLECTION_ENUM(VkFrontFace); DECLARE_REFLECTION_ENUM(VkImageAspectFlagBits); DECLARE_REFLECTION_ENUM(VkImageCreateFlagBits); @@ -1134,6 +1144,7 @@ DECLARE_REFLECTION_ENUM(VkPhysicalDeviceType); DECLARE_REFLECTION_ENUM(VkPipelineBindPoint); DECLARE_REFLECTION_ENUM(VkPipelineCreateFlagBits); DECLARE_REFLECTION_ENUM(VkPipelineStageFlagBits); +DECLARE_REFLECTION_ENUM(VkPointClippingBehavior); DECLARE_REFLECTION_ENUM(VkPolygonMode); DECLARE_REFLECTION_ENUM(VkPresentModeKHR); DECLARE_REFLECTION_ENUM(VkPrimitiveTopology); @@ -1150,32 +1161,21 @@ DECLARE_REFLECTION_ENUM(VkSamplerMipmapMode); DECLARE_REFLECTION_ENUM(VkSamplerReductionModeEXT); DECLARE_REFLECTION_ENUM(VkSamplerYcbcrModelConversion); DECLARE_REFLECTION_ENUM(VkSamplerYcbcrRange); +DECLARE_REFLECTION_ENUM(VkSemaphoreImportFlagBits); DECLARE_REFLECTION_ENUM(VkShaderStageFlagBits); DECLARE_REFLECTION_ENUM(VkSharingMode); +DECLARE_REFLECTION_ENUM(VkSparseImageFormatFlagBits); DECLARE_REFLECTION_ENUM(VkSparseMemoryBindFlagBits); DECLARE_REFLECTION_ENUM(VkStencilFaceFlagBits); DECLARE_REFLECTION_ENUM(VkStencilOp); DECLARE_REFLECTION_ENUM(VkStructureType); +DECLARE_REFLECTION_ENUM(VkSubgroupFeatureFlagBits); DECLARE_REFLECTION_ENUM(VkSubpassContents); DECLARE_REFLECTION_ENUM(VkSubpassDescriptionFlagBits); DECLARE_REFLECTION_ENUM(VkSurfaceCounterFlagBitsEXT); DECLARE_REFLECTION_ENUM(VkSurfaceTransformFlagBitsKHR); DECLARE_REFLECTION_ENUM(VkSwapchainCreateFlagBitsKHR); DECLARE_REFLECTION_ENUM(VkTessellationDomainOrigin); -DECLARE_REFLECTION_ENUM(VkVertexInputRate); - -DECLARE_REFLECTION_ENUM(VkDeviceEventTypeEXT); DECLARE_REFLECTION_ENUM(VkValidationCheckEXT); -DECLARE_REFLECTION_ENUM(VkDriverIdKHR); -DECLARE_REFLECTION_ENUM(VkSemaphoreImportFlagBits); -DECLARE_REFLECTION_ENUM(VkFenceImportFlagBits); -DECLARE_REFLECTION_ENUM(VkExternalSemaphoreFeatureFlagBits); -DECLARE_REFLECTION_ENUM(VkExternalFenceFeatureFlagBits); -DECLARE_REFLECTION_ENUM(VkDisplayPowerStateEXT); -DECLARE_REFLECTION_ENUM(VkDisplayEventTypeEXT); -DECLARE_REFLECTION_ENUM(VkSparseImageFormatFlagBits); -DECLARE_REFLECTION_ENUM(VkFormatFeatureFlagBits); -DECLARE_REFLECTION_ENUM(VkExternalMemoryFeatureFlagBits); -DECLARE_REFLECTION_ENUM(VkDisplayPlaneAlphaFlagBitsKHR); -DECLARE_REFLECTION_ENUM(VkPointClippingBehavior); -DECLARE_REFLECTION_ENUM(VkSubgroupFeatureFlagBits); \ No newline at end of file +DECLARE_REFLECTION_ENUM(VkValidationFeaturesEXT); +DECLARE_REFLECTION_ENUM(VkVertexInputRate); \ No newline at end of file diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index e85fc8ba9..7fab17059 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -52,106 +52,106 @@ }; \ typedef VkFlagWithNoBits CONCAT(flagbase, CONCAT(Flags, CONCAT(suffix, Bits))); -DECL_VKFLAG_EMPTY(VkInstanceCreate); -DECL_VKFLAG(VkFormatFeature); -DECL_VKFLAG(VkImageUsage); -DECL_VKFLAG(VkImageCreate); -DECL_VKFLAG(VkSampleCount); -DECL_VKFLAG(VkQueue); -DECL_VKFLAG(VkMemoryProperty); -DECL_VKFLAG(VkMemoryHeap); -DECL_VKFLAG_EMPTY(VkDeviceCreate); -DECL_VKFLAG(VkDeviceQueueCreate); -DECL_VKFLAG(VkPipelineStage); -DECL_VKFLAG_EMPTY(VkMemoryMap); -DECL_VKFLAG(VkImageAspect); -DECL_VKFLAG(VkSparseImageFormat); -DECL_VKFLAG(VkSparseMemoryBind); -DECL_VKFLAG(VkFenceCreate); -DECL_VKFLAG_EMPTY(VkSemaphoreCreate); -DECL_VKFLAG_EMPTY(VkEventCreate); -DECL_VKFLAG_EMPTY(VkQueryPoolCreate); -DECL_VKFLAG(VkQueryPipelineStatistic); -DECL_VKFLAG(VkQueryResult); +DECL_VKFLAG(VkAccess); +DECL_VKFLAG(VkAttachmentDescription); DECL_VKFLAG(VkBufferCreate); DECL_VKFLAG(VkBufferUsage); DECL_VKFLAG_EMPTY(VkBufferViewCreate); -DECL_VKFLAG_EMPTY(VkImageViewCreate); -DECL_VKFLAG_EMPTY(VkShaderModuleCreate); -DECL_VKFLAG_EMPTY(VkPipelineCacheCreate); -DECL_VKFLAG(VkPipelineCreate); -DECL_VKFLAG_EMPTY(VkPipelineShaderStageCreate); -DECL_VKFLAG_EMPTY(VkPipelineVertexInputStateCreate); -DECL_VKFLAG_EMPTY(VkPipelineInputAssemblyStateCreate); -DECL_VKFLAG_EMPTY(VkPipelineTessellationStateCreate); -DECL_VKFLAG_EMPTY(VkPipelineViewportStateCreate); -DECL_VKFLAG_EMPTY(VkPipelineRasterizationStateCreate); -DECL_VKFLAG(VkCullMode); -DECL_VKFLAG_EMPTY(VkPipelineMultisampleStateCreate); -DECL_VKFLAG_EMPTY(VkPipelineDepthStencilStateCreate); -DECL_VKFLAG_EMPTY(VkPipelineColorBlendStateCreate); DECL_VKFLAG(VkColorComponent); -DECL_VKFLAG_EMPTY(VkPipelineDynamicStateCreate); -DECL_VKFLAG_EMPTY(VkPipelineLayoutCreate); -DECL_VKFLAG(VkShaderStage); -DECL_VKFLAG_EMPTY(VkSamplerCreate); -DECL_VKFLAG(VkDescriptorSetLayoutCreate); -DECL_VKFLAG(VkDescriptorPoolCreate); -DECL_VKFLAG_EMPTY(VkDescriptorPoolReset); -DECL_VKFLAG_EMPTY(VkFramebufferCreate); -DECL_VKFLAG_EMPTY(VkRenderPassCreate); -DECL_VKFLAG(VkAttachmentDescription); -DECL_VKFLAG(VkSubpassDescription); -DECL_VKFLAG(VkAccess); -DECL_VKFLAG(VkDependency); +DECL_VKFLAG(VkCommandBufferReset); +DECL_VKFLAG(VkCommandBufferUsage); DECL_VKFLAG(VkCommandPoolCreate); DECL_VKFLAG(VkCommandPoolReset); -DECL_VKFLAG(VkCommandBufferUsage); -DECL_VKFLAG(VkQueryControl); -DECL_VKFLAG(VkCommandBufferReset); -DECL_VKFLAG(VkStencilFace); -DECL_VKFLAG(VkSubgroupFeature); -DECL_VKFLAG(VkPeerMemoryFeature); -DECL_VKFLAG(VkMemoryAllocate); DECL_VKFLAG_EMPTY(VkCommandPoolTrim); +DECL_VKFLAG(VkCullMode); +DECL_VKFLAG(VkDependency); +DECL_VKFLAG(VkDescriptorPoolCreate); +DECL_VKFLAG_EMPTY(VkDescriptorPoolReset); +DECL_VKFLAG(VkDescriptorSetLayoutCreate); DECL_VKFLAG_EMPTY(VkDescriptorUpdateTemplateCreate); -DECL_VKFLAG(VkExternalMemoryHandleType); -DECL_VKFLAG(VkExternalMemoryFeature); +DECL_VKFLAG_EMPTY(VkDeviceCreate); +DECL_VKFLAG(VkDeviceQueueCreate); +DECL_VKFLAG_EMPTY(VkEventCreate); DECL_VKFLAG(VkExternalFenceHandleType); DECL_VKFLAG(VkExternalFenceFeature); -DECL_VKFLAG(VkFenceImport); -DECL_VKFLAG(VkSemaphoreImport); +DECL_VKFLAG(VkExternalMemoryHandleType); +DECL_VKFLAG(VkExternalMemoryFeature); DECL_VKFLAG(VkExternalSemaphoreHandleType); DECL_VKFLAG(VkExternalSemaphoreFeature); -DECL_VKFLAG_EXT(VkSurfaceTransform, KHR); +DECL_VKFLAG(VkFormatFeature); +DECL_VKFLAG(VkImageAspect); +DECL_VKFLAG(VkImageUsage); +DECL_VKFLAG(VkImageCreate); +DECL_VKFLAG_EMPTY(VkImageViewCreate); +DECL_VKFLAG_EMPTY(VkInstanceCreate); +DECL_VKFLAG(VkFenceCreate); +DECL_VKFLAG(VkFenceImport); +DECL_VKFLAG_EMPTY(VkFramebufferCreate); +DECL_VKFLAG(VkMemoryAllocate); +DECL_VKFLAG(VkMemoryHeap); +DECL_VKFLAG_EMPTY(VkMemoryMap); +DECL_VKFLAG(VkMemoryProperty); +DECL_VKFLAG(VkPeerMemoryFeature); +DECL_VKFLAG_EMPTY(VkPipelineCacheCreate); +DECL_VKFLAG_EMPTY(VkPipelineColorBlendStateCreate); +DECL_VKFLAG(VkPipelineCreate); +DECL_VKFLAG_EMPTY(VkPipelineDepthStencilStateCreate); +DECL_VKFLAG_EMPTY(VkPipelineDynamicStateCreate); +DECL_VKFLAG_EMPTY(VkPipelineInputAssemblyStateCreate); +DECL_VKFLAG_EMPTY(VkPipelineLayoutCreate); +DECL_VKFLAG_EMPTY(VkPipelineMultisampleStateCreate); +DECL_VKFLAG_EMPTY(VkPipelineRasterizationStateCreate); +DECL_VKFLAG_EMPTY(VkPipelineShaderStageCreate); +DECL_VKFLAG(VkPipelineStage); +DECL_VKFLAG_EMPTY(VkPipelineTessellationStateCreate); +DECL_VKFLAG_EMPTY(VkPipelineVertexInputStateCreate); +DECL_VKFLAG_EMPTY(VkPipelineViewportStateCreate); +DECL_VKFLAG(VkQueryControl); +DECL_VKFLAG(VkQueryPipelineStatistic); +DECL_VKFLAG_EMPTY(VkQueryPoolCreate); +DECL_VKFLAG(VkQueryResult); +DECL_VKFLAG(VkQueue); +DECL_VKFLAG_EMPTY(VkRenderPassCreate); +DECL_VKFLAG_EMPTY(VkSamplerCreate); +DECL_VKFLAG(VkSampleCount); +DECL_VKFLAG_EMPTY(VkSemaphoreCreate); +DECL_VKFLAG(VkSemaphoreImport); +DECL_VKFLAG_EMPTY(VkShaderModuleCreate); +DECL_VKFLAG(VkShaderStage); +DECL_VKFLAG(VkSparseImageFormat); +DECL_VKFLAG(VkSparseMemoryBind); +DECL_VKFLAG(VkStencilFace); +DECL_VKFLAG(VkSubgroupFeature); +DECL_VKFLAG(VkSubpassDescription); +DECL_VKFLAG_EXT(VkBuildAccelerationStructure, NV); DECL_VKFLAG_EXT(VkCompositeAlpha, KHR); -DECL_VKFLAG_EXT(VkSwapchainCreate, KHR); -DECL_VKFLAG_EXT(VkDeviceGroupPresentMode, KHR); -DECL_VKFLAG_EXT(VkDisplayPlaneAlpha, KHR); -DECL_VKFLAG_EMPTY_EXT(VkDisplayModeCreate, KHR); -DECL_VKFLAG_EMPTY_EXT(VkDisplaySurfaceCreate, KHR); -DECL_VKFLAG_EXT(VkDebugReport, EXT); -DECL_VKFLAG_EMPTY_EXT(VkPipelineRasterizationStateStreamCreate, EXT); -DECL_VKFLAG_EXT(VkExternalMemoryHandleType, NV); -DECL_VKFLAG_EXT(VkExternalMemoryFeature, NV); DECL_VKFLAG_EXT(VkConditionalRendering, EXT); -DECL_VKFLAG_EXT(VkIndirectCommandsLayoutUsage, NVX); -DECL_VKFLAG_EXT(VkObjectEntryUsage, NVX); -DECL_VKFLAG_EXT(VkSurfaceCounter, EXT); -DECL_VKFLAG_EMPTY_EXT(VkPipelineViewportSwizzleStateCreate, NV); -DECL_VKFLAG_EMPTY_EXT(VkPipelineDiscardRectangleStateCreate, EXT); -DECL_VKFLAG_EMPTY_EXT(VkPipelineRasterizationConservativeStateCreate, EXT); +DECL_VKFLAG_EXT(VkDebugReport, EXT); DECL_VKFLAG_EMPTY_EXT(VkDebugUtilsMessengerCallbackData, EXT); DECL_VKFLAG_EMPTY_EXT(VkDebugUtilsMessengerCreate, EXT); DECL_VKFLAG_EXT(VkDebugUtilsMessageSeverity, EXT); DECL_VKFLAG_EXT(VkDebugUtilsMessageType, EXT); -DECL_VKFLAG_EMPTY_EXT(VkPipelineCoverageToColorStateCreate, NV); -DECL_VKFLAG_EMPTY_EXT(VkPipelineCoverageModulationStateCreate, NV); -DECL_VKFLAG_EMPTY_EXT(VkValidationCacheCreate, EXT); DECL_VKFLAG_EXT(VkDescriptorBinding, EXT); +DECL_VKFLAG_EXT(VkDeviceGroupPresentMode, KHR); +DECL_VKFLAG_EMPTY_EXT(VkDisplayModeCreate, KHR); +DECL_VKFLAG_EXT(VkDisplayPlaneAlpha, KHR); +DECL_VKFLAG_EMPTY_EXT(VkDisplaySurfaceCreate, KHR); +DECL_VKFLAG_EXT(VkExternalMemoryHandleType, NV); +DECL_VKFLAG_EXT(VkExternalMemoryFeature, NV); DECL_VKFLAG_EXT(VkGeometry, NV); DECL_VKFLAG_EXT(VkGeometryInstance, NV); -DECL_VKFLAG_EXT(VkBuildAccelerationStructure, NV); +DECL_VKFLAG_EXT(VkIndirectCommandsLayoutUsage, NVX); +DECL_VKFLAG_EXT(VkObjectEntryUsage, NVX); +DECL_VKFLAG_EMPTY_EXT(VkPipelineCoverageModulationStateCreate, NV); +DECL_VKFLAG_EMPTY_EXT(VkPipelineCoverageToColorStateCreate, NV); +DECL_VKFLAG_EMPTY_EXT(VkPipelineDiscardRectangleStateCreate, EXT); +DECL_VKFLAG_EMPTY_EXT(VkPipelineRasterizationConservativeStateCreate, EXT); +DECL_VKFLAG_EMPTY_EXT(VkPipelineRasterizationStateStreamCreate, EXT); +DECL_VKFLAG_EMPTY_EXT(VkPipelineViewportSwizzleStateCreate, NV); +DECL_VKFLAG_EXT(VkSurfaceCounter, EXT); +DECL_VKFLAG_EXT(VkSurfaceTransform, KHR); +DECL_VKFLAG_EXT(VkSwapchainCreate, KHR); +DECL_VKFLAG_EMPTY_EXT(VkValidationCacheCreate, EXT); // serialise a member as flags - cast to the Bits enum for serialisation so the stringification // picks up the bitfield and doesn't treat it as uint32_t. Then we rename the type back to the base