3939// Object Type enum for validation layer internal object handling
4040typedef enum VulkanObjectType {
4141 kVulkanObjectTypeUnknown = 0 ,
42- kVulkanObjectTypeBuffer = 1 ,
43- kVulkanObjectTypeImage = 2 ,
44- kVulkanObjectTypeInstance = 3 ,
45- kVulkanObjectTypePhysicalDevice = 4 ,
46- kVulkanObjectTypeDevice = 5 ,
47- kVulkanObjectTypeQueue = 6 ,
48- kVulkanObjectTypeSemaphore = 7 ,
49- kVulkanObjectTypeCommandBuffer = 8 ,
50- kVulkanObjectTypeFence = 9 ,
51- kVulkanObjectTypeDeviceMemory = 10 ,
42+ kVulkanObjectTypeInstance = 1 ,
43+ kVulkanObjectTypePhysicalDevice = 2 ,
44+ kVulkanObjectTypeDevice = 3 ,
45+ kVulkanObjectTypeQueue = 4 ,
46+ kVulkanObjectTypeSemaphore = 5 ,
47+ kVulkanObjectTypeCommandBuffer = 6 ,
48+ kVulkanObjectTypeFence = 7 ,
49+ kVulkanObjectTypeDeviceMemory = 8 ,
50+ kVulkanObjectTypeBuffer = 9 ,
51+ kVulkanObjectTypeImage = 10 ,
5252 kVulkanObjectTypeQueryPool = 11 ,
5353 kVulkanObjectTypeImageView = 12 ,
5454 kVulkanObjectTypeCommandPool = 13 ,
@@ -58,8 +58,8 @@ typedef enum VulkanObjectType {
5858 kVulkanObjectTypeBufferView = 17 ,
5959 kVulkanObjectTypeShaderModule = 18 ,
6060 kVulkanObjectTypePipelineCache = 19 ,
61- kVulkanObjectTypePipelineLayout = 20 ,
62- kVulkanObjectTypePipeline = 21 ,
61+ kVulkanObjectTypePipeline = 20 ,
62+ kVulkanObjectTypePipelineLayout = 21 ,
6363 kVulkanObjectTypeDescriptorSetLayout = 22 ,
6464 kVulkanObjectTypeSampler = 23 ,
6565 kVulkanObjectTypeDescriptorSet = 24 ,
@@ -106,8 +106,6 @@ typedef enum VulkanObjectType {
106106// Array of object name strings for OBJECT_TYPE enum conversion
107107static const char * const object_string [kVulkanObjectTypeMax ] = {
108108 "Unknown" ,
109- "Buffer" ,
110- "Image" ,
111109 "Instance" ,
112110 "PhysicalDevice" ,
113111 "Device" ,
@@ -116,6 +114,8 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
116114 "CommandBuffer" ,
117115 "Fence" ,
118116 "DeviceMemory" ,
117+ "Buffer" ,
118+ "Image" ,
119119 "QueryPool" ,
120120 "ImageView" ,
121121 "CommandPool" ,
@@ -125,8 +125,8 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
125125 "BufferView" ,
126126 "ShaderModule" ,
127127 "PipelineCache" ,
128- "PipelineLayout" ,
129128 "Pipeline" ,
129+ "PipelineLayout" ,
130130 "DescriptorSetLayout" ,
131131 "Sampler" ,
132132 "DescriptorSet" ,
@@ -168,8 +168,6 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
168168// Helper array to get Vulkan VK_EXT_debug_report object type enum from the internal layers version
169169const VkDebugReportObjectTypeEXT get_debug_report_enum [] = {
170170 VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT , // kVulkanObjectTypeUnknown
171- VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT , // kVulkanObjectTypeBuffer
172- VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT , // kVulkanObjectTypeImage
173171 VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT , // kVulkanObjectTypeInstance
174172 VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT , // kVulkanObjectTypePhysicalDevice
175173 VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT , // kVulkanObjectTypeDevice
@@ -178,6 +176,8 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
178176 VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT , // kVulkanObjectTypeCommandBuffer
179177 VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT , // kVulkanObjectTypeFence
180178 VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT , // kVulkanObjectTypeDeviceMemory
179+ VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT , // kVulkanObjectTypeBuffer
180+ VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT , // kVulkanObjectTypeImage
181181 VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT , // kVulkanObjectTypeQueryPool
182182 VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT , // kVulkanObjectTypeImageView
183183 VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT , // kVulkanObjectTypeCommandPool
@@ -187,8 +187,8 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
187187 VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT , // kVulkanObjectTypeBufferView
188188 VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT , // kVulkanObjectTypeShaderModule
189189 VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT , // kVulkanObjectTypePipelineCache
190- VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT , // kVulkanObjectTypePipelineLayout
191190 VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT , // kVulkanObjectTypePipeline
191+ VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT , // kVulkanObjectTypePipelineLayout
192192 VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT , // kVulkanObjectTypeDescriptorSetLayout
193193 VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT , // kVulkanObjectTypeSampler
194194 VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT , // kVulkanObjectTypeDescriptorSet
@@ -230,8 +230,6 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
230230// Helper array to get Official Vulkan VkObjectType enum from the internal layers version
231231const VkObjectType get_object_type_enum [] = {
232232 VK_OBJECT_TYPE_UNKNOWN , // kVulkanObjectTypeUnknown
233- VK_OBJECT_TYPE_BUFFER , // kVulkanObjectTypeBuffer
234- VK_OBJECT_TYPE_IMAGE , // kVulkanObjectTypeImage
235233 VK_OBJECT_TYPE_INSTANCE , // kVulkanObjectTypeInstance
236234 VK_OBJECT_TYPE_PHYSICAL_DEVICE , // kVulkanObjectTypePhysicalDevice
237235 VK_OBJECT_TYPE_DEVICE , // kVulkanObjectTypeDevice
@@ -240,6 +238,8 @@ const VkObjectType get_object_type_enum[] = {
240238 VK_OBJECT_TYPE_COMMAND_BUFFER , // kVulkanObjectTypeCommandBuffer
241239 VK_OBJECT_TYPE_FENCE , // kVulkanObjectTypeFence
242240 VK_OBJECT_TYPE_DEVICE_MEMORY , // kVulkanObjectTypeDeviceMemory
241+ VK_OBJECT_TYPE_BUFFER , // kVulkanObjectTypeBuffer
242+ VK_OBJECT_TYPE_IMAGE , // kVulkanObjectTypeImage
243243 VK_OBJECT_TYPE_QUERY_POOL , // kVulkanObjectTypeQueryPool
244244 VK_OBJECT_TYPE_IMAGE_VIEW , // kVulkanObjectTypeImageView
245245 VK_OBJECT_TYPE_COMMAND_POOL , // kVulkanObjectTypeCommandPool
@@ -249,8 +249,8 @@ const VkObjectType get_object_type_enum[] = {
249249 VK_OBJECT_TYPE_BUFFER_VIEW , // kVulkanObjectTypeBufferView
250250 VK_OBJECT_TYPE_SHADER_MODULE , // kVulkanObjectTypeShaderModule
251251 VK_OBJECT_TYPE_PIPELINE_CACHE , // kVulkanObjectTypePipelineCache
252- VK_OBJECT_TYPE_PIPELINE_LAYOUT , // kVulkanObjectTypePipelineLayout
253252 VK_OBJECT_TYPE_PIPELINE , // kVulkanObjectTypePipeline
253+ VK_OBJECT_TYPE_PIPELINE_LAYOUT , // kVulkanObjectTypePipelineLayout
254254 VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT , // kVulkanObjectTypeDescriptorSetLayout
255255 VK_OBJECT_TYPE_SAMPLER , // kVulkanObjectTypeSampler
256256 VK_OBJECT_TYPE_DESCRIPTOR_SET , // kVulkanObjectTypeDescriptorSet
0 commit comments