scripts: Move ThreadSaftey over to VulkanObject

layers/vulkan/generated/thread_safety_counter_bodies.h

@@ -1,67 +1,71 @@
+// *** THIS FILE IS GENERATED - DO NOT EDIT ***
+// See thread_safety_generator.py for modifications
 
-// This file is ***GENERATED***.  Do Not Edit.
-// See thread_safety_generator.py for modifications.
+/***************************************************************************
+*
+* Copyright (c) 2015-2023 The Khronos Group Inc.
+* Copyright (c) 2015-2023 Valve Corporation
+* Copyright (c) 2015-2023 LunarG, Inc.
+* Copyright (c) 2015-2023 Google Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+****************************************************************************/
 
-/* Copyright (c) 2015-2023 The Khronos Group Inc.
- * Copyright (c) 2015-2023 Valve Corporation
- * Copyright (c) 2015-2023 LunarG, Inc.
- * Copyright (c) 2015-2023 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-WRAPPER(VkAccelerationStructureKHR)
-WRAPPER(VkAccelerationStructureNV)
+// NOLINTBEGIN
 WRAPPER(VkBuffer)
-#ifdef VK_USE_PLATFORM_FUCHSIA
-WRAPPER(VkBufferCollectionFUCHSIA)
-#endif
-WRAPPER(VkBufferView)
-WRAPPER(VkCommandPool)
-WRAPPER(VkCuFunctionNVX)
-WRAPPER(VkCuModuleNVX)
-WRAPPER_PARENT_INSTANCE(VkDebugReportCallbackEXT)
-WRAPPER_PARENT_INSTANCE(VkDebugUtilsMessengerEXT)
-WRAPPER(VkDeferredOperationKHR)
-WRAPPER(VkDescriptorPool)
-WRAPPER(VkDescriptorSet)
-WRAPPER(VkDescriptorSetLayout)
-WRAPPER(VkDescriptorUpdateTemplate)
+WRAPPER(VkImage)
+WRAPPER(VkSemaphore)
+WRAPPER(VkFence)
 WRAPPER(VkDeviceMemory)
-WRAPPER_PARENT_INSTANCE(VkDisplayKHR)
-WRAPPER(VkDisplayModeKHR)
 WRAPPER(VkEvent)
-WRAPPER(VkFence)
-WRAPPER(VkFramebuffer)
-WRAPPER(VkImage)
+WRAPPER(VkQueryPool)
+WRAPPER(VkBufferView)
 WRAPPER(VkImageView)
-WRAPPER(VkIndirectCommandsLayoutNV)
-WRAPPER(VkMicromapEXT)
-WRAPPER(VkOpticalFlowSessionNV)
-WRAPPER(VkPerformanceConfigurationINTEL)
-WRAPPER(VkPipeline)
+WRAPPER(VkShaderModule)
 WRAPPER(VkPipelineCache)
 WRAPPER(VkPipelineLayout)
-WRAPPER(VkPrivateDataSlot)
-WRAPPER(VkQueryPool)
+WRAPPER(VkPipeline)
 WRAPPER(VkRenderPass)
+WRAPPER(VkDescriptorSetLayout)
 WRAPPER(VkSampler)
+WRAPPER(VkDescriptorSet)
+WRAPPER(VkDescriptorPool)
+WRAPPER(VkFramebuffer)
+WRAPPER(VkCommandPool)
 WRAPPER(VkSamplerYcbcrConversion)
-WRAPPER(VkSemaphore)
-WRAPPER(VkShaderEXT)
-WRAPPER(VkShaderModule)
+WRAPPER(VkDescriptorUpdateTemplate)
+WRAPPER(VkPrivateDataSlot)
 WRAPPER_PARENT_INSTANCE(VkSurfaceKHR)
 WRAPPER_PARENT_INSTANCE(VkSwapchainKHR)
-WRAPPER(VkValidationCacheEXT)
+WRAPPER_PARENT_INSTANCE(VkDisplayKHR)
+WRAPPER(VkDisplayModeKHR)
 WRAPPER(VkVideoSessionKHR)
 WRAPPER(VkVideoSessionParametersKHR)
+WRAPPER(VkDeferredOperationKHR)
+WRAPPER_PARENT_INSTANCE(VkDebugReportCallbackEXT)
+WRAPPER(VkCuModuleNVX)
+WRAPPER(VkCuFunctionNVX)
+WRAPPER_PARENT_INSTANCE(VkDebugUtilsMessengerEXT)
+WRAPPER(VkValidationCacheEXT)
+WRAPPER(VkAccelerationStructureNV)
+WRAPPER(VkPerformanceConfigurationINTEL)
+WRAPPER(VkIndirectCommandsLayoutNV)
+WRAPPER(VkAccelerationStructureKHR)
+#ifdef VK_USE_PLATFORM_FUCHSIA
+WRAPPER(VkBufferCollectionFUCHSIA)
+#endif // VK_USE_PLATFORM_FUCHSIA
+WRAPPER(VkMicromapEXT)
+WRAPPER(VkOpticalFlowSessionNV)
+WRAPPER(VkShaderEXT)
 
+// NOLINTEND

layers/vulkan/generated/thread_safety_counter_definitions.h

@@ -1,67 +1,71 @@
+// *** THIS FILE IS GENERATED - DO NOT EDIT ***
+// See thread_safety_generator.py for modifications
 
-// This file is ***GENERATED***.  Do Not Edit.
-// See thread_safety_generator.py for modifications.
+/***************************************************************************
+*
+* Copyright (c) 2015-2023 The Khronos Group Inc.
+* Copyright (c) 2015-2023 Valve Corporation
+* Copyright (c) 2015-2023 LunarG, Inc.
+* Copyright (c) 2015-2023 Google Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+****************************************************************************/
 
-/* Copyright (c) 2015-2023 The Khronos Group Inc.
- * Copyright (c) 2015-2023 Valve Corporation
- * Copyright (c) 2015-2023 LunarG, Inc.
- * Copyright (c) 2015-2023 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-counter<VkAccelerationStructureKHR> c_VkAccelerationStructureKHR;
-counter<VkAccelerationStructureNV> c_VkAccelerationStructureNV;
+// NOLINTBEGIN
 counter<VkBuffer> c_VkBuffer;
-#ifdef VK_USE_PLATFORM_FUCHSIA
-counter<VkBufferCollectionFUCHSIA> c_VkBufferCollectionFUCHSIA;
-#endif
-counter<VkBufferView> c_VkBufferView;
-counter<VkCommandPool> c_VkCommandPool;
-counter<VkCuFunctionNVX> c_VkCuFunctionNVX;
-counter<VkCuModuleNVX> c_VkCuModuleNVX;
-counter<VkDebugReportCallbackEXT> c_VkDebugReportCallbackEXT;
-counter<VkDebugUtilsMessengerEXT> c_VkDebugUtilsMessengerEXT;
-counter<VkDeferredOperationKHR> c_VkDeferredOperationKHR;
-counter<VkDescriptorPool> c_VkDescriptorPool;
-counter<VkDescriptorSet> c_VkDescriptorSet;
-counter<VkDescriptorSetLayout> c_VkDescriptorSetLayout;
-counter<VkDescriptorUpdateTemplate> c_VkDescriptorUpdateTemplate;
+counter<VkImage> c_VkImage;
+counter<VkSemaphore> c_VkSemaphore;
+counter<VkFence> c_VkFence;
 counter<VkDeviceMemory> c_VkDeviceMemory;
-counter<VkDisplayKHR> c_VkDisplayKHR;
-counter<VkDisplayModeKHR> c_VkDisplayModeKHR;
 counter<VkEvent> c_VkEvent;
-counter<VkFence> c_VkFence;
-counter<VkFramebuffer> c_VkFramebuffer;
-counter<VkImage> c_VkImage;
+counter<VkQueryPool> c_VkQueryPool;
+counter<VkBufferView> c_VkBufferView;
 counter<VkImageView> c_VkImageView;
-counter<VkIndirectCommandsLayoutNV> c_VkIndirectCommandsLayoutNV;
-counter<VkMicromapEXT> c_VkMicromapEXT;
-counter<VkOpticalFlowSessionNV> c_VkOpticalFlowSessionNV;
-counter<VkPerformanceConfigurationINTEL> c_VkPerformanceConfigurationINTEL;
-counter<VkPipeline> c_VkPipeline;
+counter<VkShaderModule> c_VkShaderModule;
 counter<VkPipelineCache> c_VkPipelineCache;
 counter<VkPipelineLayout> c_VkPipelineLayout;
-counter<VkPrivateDataSlot> c_VkPrivateDataSlot;
-counter<VkQueryPool> c_VkQueryPool;
+counter<VkPipeline> c_VkPipeline;
 counter<VkRenderPass> c_VkRenderPass;
+counter<VkDescriptorSetLayout> c_VkDescriptorSetLayout;
 counter<VkSampler> c_VkSampler;
+counter<VkDescriptorSet> c_VkDescriptorSet;
+counter<VkDescriptorPool> c_VkDescriptorPool;
+counter<VkFramebuffer> c_VkFramebuffer;
+counter<VkCommandPool> c_VkCommandPool;
 counter<VkSamplerYcbcrConversion> c_VkSamplerYcbcrConversion;
-counter<VkSemaphore> c_VkSemaphore;
-counter<VkShaderEXT> c_VkShaderEXT;
-counter<VkShaderModule> c_VkShaderModule;
+counter<VkDescriptorUpdateTemplate> c_VkDescriptorUpdateTemplate;
+counter<VkPrivateDataSlot> c_VkPrivateDataSlot;
 counter<VkSurfaceKHR> c_VkSurfaceKHR;
 counter<VkSwapchainKHR> c_VkSwapchainKHR;
-counter<VkValidationCacheEXT> c_VkValidationCacheEXT;
+counter<VkDisplayKHR> c_VkDisplayKHR;
+counter<VkDisplayModeKHR> c_VkDisplayModeKHR;
 counter<VkVideoSessionKHR> c_VkVideoSessionKHR;
 counter<VkVideoSessionParametersKHR> c_VkVideoSessionParametersKHR;
+counter<VkDeferredOperationKHR> c_VkDeferredOperationKHR;
+counter<VkDebugReportCallbackEXT> c_VkDebugReportCallbackEXT;
+counter<VkCuModuleNVX> c_VkCuModuleNVX;
+counter<VkCuFunctionNVX> c_VkCuFunctionNVX;
+counter<VkDebugUtilsMessengerEXT> c_VkDebugUtilsMessengerEXT;
+counter<VkValidationCacheEXT> c_VkValidationCacheEXT;
+counter<VkAccelerationStructureNV> c_VkAccelerationStructureNV;
+counter<VkPerformanceConfigurationINTEL> c_VkPerformanceConfigurationINTEL;
+counter<VkIndirectCommandsLayoutNV> c_VkIndirectCommandsLayoutNV;
+counter<VkAccelerationStructureKHR> c_VkAccelerationStructureKHR;
+#ifdef VK_USE_PLATFORM_FUCHSIA
+counter<VkBufferCollectionFUCHSIA> c_VkBufferCollectionFUCHSIA;
+#endif // VK_USE_PLATFORM_FUCHSIA
+counter<VkMicromapEXT> c_VkMicromapEXT;
+counter<VkOpticalFlowSessionNV> c_VkOpticalFlowSessionNV;
+counter<VkShaderEXT> c_VkShaderEXT;
 
+// NOLINTEND

layers/vulkan/generated/thread_safety_counter_instances.h

@@ -1,67 +1,71 @@
+// *** THIS FILE IS GENERATED - DO NOT EDIT ***
+// See thread_safety_generator.py for modifications
 
-// This file is ***GENERATED***.  Do Not Edit.
-// See thread_safety_generator.py for modifications.
+/***************************************************************************
+*
+* Copyright (c) 2015-2023 The Khronos Group Inc.
+* Copyright (c) 2015-2023 Valve Corporation
+* Copyright (c) 2015-2023 LunarG, Inc.
+* Copyright (c) 2015-2023 Google Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+****************************************************************************/
 
-/* Copyright (c) 2015-2023 The Khronos Group Inc.
- * Copyright (c) 2015-2023 Valve Corporation
- * Copyright (c) 2015-2023 LunarG, Inc.
- * Copyright (c) 2015-2023 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-c_VkAccelerationStructureKHR("VkAccelerationStructureKHR", kVulkanObjectTypeAccelerationStructureKHR, this),
-c_VkAccelerationStructureNV("VkAccelerationStructureNV", kVulkanObjectTypeAccelerationStructureNV, this),
+// NOLINTBEGIN
 c_VkBuffer("VkBuffer", kVulkanObjectTypeBuffer, this),
-#ifdef VK_USE_PLATFORM_FUCHSIA
-c_VkBufferCollectionFUCHSIA("VkBufferCollectionFUCHSIA", kVulkanObjectTypeBufferCollectionFUCHSIA, this),
-#endif
-c_VkBufferView("VkBufferView", kVulkanObjectTypeBufferView, this),
-c_VkCommandPool("VkCommandPool", kVulkanObjectTypeCommandPool, this),
-c_VkCuFunctionNVX("VkCuFunctionNVX", kVulkanObjectTypeCuFunctionNVX, this),
-c_VkCuModuleNVX("VkCuModuleNVX", kVulkanObjectTypeCuModuleNVX, this),
-c_VkDebugReportCallbackEXT("VkDebugReportCallbackEXT", kVulkanObjectTypeDebugReportCallbackEXT, this),
-c_VkDebugUtilsMessengerEXT("VkDebugUtilsMessengerEXT", kVulkanObjectTypeDebugUtilsMessengerEXT, this),
-c_VkDeferredOperationKHR("VkDeferredOperationKHR", kVulkanObjectTypeDeferredOperationKHR, this),
-c_VkDescriptorPool("VkDescriptorPool", kVulkanObjectTypeDescriptorPool, this),
-c_VkDescriptorSet("VkDescriptorSet", kVulkanObjectTypeDescriptorSet, this),
-c_VkDescriptorSetLayout("VkDescriptorSetLayout", kVulkanObjectTypeDescriptorSetLayout, this),
-c_VkDescriptorUpdateTemplate("VkDescriptorUpdateTemplate", kVulkanObjectTypeDescriptorUpdateTemplate, this),
+c_VkImage("VkImage", kVulkanObjectTypeImage, this),
+c_VkSemaphore("VkSemaphore", kVulkanObjectTypeSemaphore, this),
+c_VkFence("VkFence", kVulkanObjectTypeFence, this),
 c_VkDeviceMemory("VkDeviceMemory", kVulkanObjectTypeDeviceMemory, this),
-c_VkDisplayKHR("VkDisplayKHR", kVulkanObjectTypeDisplayKHR, this),
-c_VkDisplayModeKHR("VkDisplayModeKHR", kVulkanObjectTypeDisplayModeKHR, this),
 c_VkEvent("VkEvent", kVulkanObjectTypeEvent, this),
-c_VkFence("VkFence", kVulkanObjectTypeFence, this),
-c_VkFramebuffer("VkFramebuffer", kVulkanObjectTypeFramebuffer, this),
-c_VkImage("VkImage", kVulkanObjectTypeImage, this),
+c_VkQueryPool("VkQueryPool", kVulkanObjectTypeQueryPool, this),
+c_VkBufferView("VkBufferView", kVulkanObjectTypeBufferView, this),
 c_VkImageView("VkImageView", kVulkanObjectTypeImageView, this),
-c_VkIndirectCommandsLayoutNV("VkIndirectCommandsLayoutNV", kVulkanObjectTypeIndirectCommandsLayoutNV, this),
-c_VkMicromapEXT("VkMicromapEXT", kVulkanObjectTypeMicromapEXT, this),
-c_VkOpticalFlowSessionNV("VkOpticalFlowSessionNV", kVulkanObjectTypeOpticalFlowSessionNV, this),
-c_VkPerformanceConfigurationINTEL("VkPerformanceConfigurationINTEL", kVulkanObjectTypePerformanceConfigurationINTEL, this),
-c_VkPipeline("VkPipeline", kVulkanObjectTypePipeline, this),
+c_VkShaderModule("VkShaderModule", kVulkanObjectTypeShaderModule, this),
 c_VkPipelineCache("VkPipelineCache", kVulkanObjectTypePipelineCache, this),
 c_VkPipelineLayout("VkPipelineLayout", kVulkanObjectTypePipelineLayout, this),
-c_VkPrivateDataSlot("VkPrivateDataSlot", kVulkanObjectTypePrivateDataSlot, this),
-c_VkQueryPool("VkQueryPool", kVulkanObjectTypeQueryPool, this),
+c_VkPipeline("VkPipeline", kVulkanObjectTypePipeline, this),
 c_VkRenderPass("VkRenderPass", kVulkanObjectTypeRenderPass, this),
+c_VkDescriptorSetLayout("VkDescriptorSetLayout", kVulkanObjectTypeDescriptorSetLayout, this),
 c_VkSampler("VkSampler", kVulkanObjectTypeSampler, this),
+c_VkDescriptorSet("VkDescriptorSet", kVulkanObjectTypeDescriptorSet, this),
+c_VkDescriptorPool("VkDescriptorPool", kVulkanObjectTypeDescriptorPool, this),
+c_VkFramebuffer("VkFramebuffer", kVulkanObjectTypeFramebuffer, this),
+c_VkCommandPool("VkCommandPool", kVulkanObjectTypeCommandPool, this),
 c_VkSamplerYcbcrConversion("VkSamplerYcbcrConversion", kVulkanObjectTypeSamplerYcbcrConversion, this),
-c_VkSemaphore("VkSemaphore", kVulkanObjectTypeSemaphore, this),
-c_VkShaderEXT("VkShaderEXT", kVulkanObjectTypeShaderEXT, this),
-c_VkShaderModule("VkShaderModule", kVulkanObjectTypeShaderModule, this),
+c_VkDescriptorUpdateTemplate("VkDescriptorUpdateTemplate", kVulkanObjectTypeDescriptorUpdateTemplate, this),
+c_VkPrivateDataSlot("VkPrivateDataSlot", kVulkanObjectTypePrivateDataSlot, this),
 c_VkSurfaceKHR("VkSurfaceKHR", kVulkanObjectTypeSurfaceKHR, this),
 c_VkSwapchainKHR("VkSwapchainKHR", kVulkanObjectTypeSwapchainKHR, this),
-c_VkValidationCacheEXT("VkValidationCacheEXT", kVulkanObjectTypeValidationCacheEXT, this),
+c_VkDisplayKHR("VkDisplayKHR", kVulkanObjectTypeDisplayKHR, this),
+c_VkDisplayModeKHR("VkDisplayModeKHR", kVulkanObjectTypeDisplayModeKHR, this),
 c_VkVideoSessionKHR("VkVideoSessionKHR", kVulkanObjectTypeVideoSessionKHR, this),
 c_VkVideoSessionParametersKHR("VkVideoSessionParametersKHR", kVulkanObjectTypeVideoSessionParametersKHR, this),
+c_VkDeferredOperationKHR("VkDeferredOperationKHR", kVulkanObjectTypeDeferredOperationKHR, this),
+c_VkDebugReportCallbackEXT("VkDebugReportCallbackEXT", kVulkanObjectTypeDebugReportCallbackEXT, this),
+c_VkCuModuleNVX("VkCuModuleNVX", kVulkanObjectTypeCuModuleNVX, this),
+c_VkCuFunctionNVX("VkCuFunctionNVX", kVulkanObjectTypeCuFunctionNVX, this),
+c_VkDebugUtilsMessengerEXT("VkDebugUtilsMessengerEXT", kVulkanObjectTypeDebugUtilsMessengerEXT, this),
+c_VkValidationCacheEXT("VkValidationCacheEXT", kVulkanObjectTypeValidationCacheEXT, this),
+c_VkAccelerationStructureNV("VkAccelerationStructureNV", kVulkanObjectTypeAccelerationStructureNV, this),
+c_VkPerformanceConfigurationINTEL("VkPerformanceConfigurationINTEL", kVulkanObjectTypePerformanceConfigurationINTEL, this),
+c_VkIndirectCommandsLayoutNV("VkIndirectCommandsLayoutNV", kVulkanObjectTypeIndirectCommandsLayoutNV, this),
+c_VkAccelerationStructureKHR("VkAccelerationStructureKHR", kVulkanObjectTypeAccelerationStructureKHR, this),
+#ifdef VK_USE_PLATFORM_FUCHSIA
+c_VkBufferCollectionFUCHSIA("VkBufferCollectionFUCHSIA", kVulkanObjectTypeBufferCollectionFUCHSIA, this),
+#endif // VK_USE_PLATFORM_FUCHSIA
+c_VkMicromapEXT("VkMicromapEXT", kVulkanObjectTypeMicromapEXT, this),
+c_VkOpticalFlowSessionNV("VkOpticalFlowSessionNV", kVulkanObjectTypeOpticalFlowSessionNV, this),
+c_VkShaderEXT("VkShaderEXT", kVulkanObjectTypeShaderEXT, this),
 
+// NOLINTEND