layers: Simplify instance vs device extension handling

DeviceExtensions has always inherited from InstanceExtensions, so having separate device_extension and instance_extension members in ValidationObject was redundant. There's now a single extensions member and there are 3 use cases: 1) In vvl::dispatch::Instance and ValidationObjects representing a VkInstance, extensions represents what was in VkInstanceCreateInfo 2) In vvl::dispatch::Device and ValidationObjects representing a VkDevice, extensions represents what was in VkDeviceCreateInfo for device extensions, as well as what is in the VkInstance 3) In StatelessValidation objects representing VkInstances, the physical_device_extensions map represents the supported extensions for all physical devices.
KhronosGroup · Jan 14, 2025 · e37de73 · e37de73
1 parent 30e252f
commit e37de73
Show file tree

Hide file tree

Showing 49 changed files with 1,413 additions and 1,525 deletions.
diff --git a/layers/best_practices/bp_descriptor.cpp b/layers/best_practices/bp_descriptor.cpp
@@ -1,6 +1,6 @@
-/* Copyright (c) 2015-2024 The Khronos Group Inc.
- * Copyright (c) 2015-2024 Valve Corporation
- * Copyright (c) 2015-2024 LunarG, Inc.
+/* Copyright (c) 2015-2025 The Khronos Group Inc.
+ * Copyright (c) 2015-2025 Valve Corporation
+ * Copyright (c) 2015-2025 LunarG, Inc.
  * Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
  * Modifications Copyright (C) 2022 RasterGrid Kft.
  *
@@ -40,7 +40,7 @@ bool BestPractices::PreCallValidateAllocateDescriptorSets(VkDevice device, const
             VendorSpecificTag(kBPVendorArm));
     }
 
-    if (IsExtEnabled(device_extensions.vk_khr_maintenance1)) {
+    if (IsExtEnabled(extensions.vk_khr_maintenance1)) {
         // Track number of descriptorSets allowable in this pool
         if (pool_state->GetAvailableSets() < pAllocateInfo->descriptorSetCount) {
             skip |=

diff --git a/layers/best_practices/bp_device_memory.cpp b/layers/best_practices/bp_device_memory.cpp
@@ -62,7 +62,7 @@ bool BestPractices::PreCallValidateAllocateMemory(VkDevice device, const VkMemor
     }
 
     if (VendorCheckEnabled(kBPVendorNVIDIA)) {
-        if (!IsExtEnabled(device_extensions.vk_ext_pageable_device_local_memory) &&
+        if (!IsExtEnabled(extensions.vk_ext_pageable_device_local_memory) &&
             !vku::FindStructInPNextChain<VkMemoryPriorityAllocateInfoEXT>(pAllocateInfo->pNext)) {
             skip |= LogPerformanceWarning(
                 "BestPractices-NVIDIA-AllocateMemory-SetPriority", device, error_obj.location,
@@ -293,7 +293,7 @@ void BestPractices::PostCallRecordSetDeviceMemoryPriorityEXT(VkDevice device, Vk
 bool BestPractices::ValidateBindMemory(VkDevice device, VkDeviceMemory memory, const Location& loc) const {
     bool skip = false;
 
-    if (VendorCheckEnabled(kBPVendorNVIDIA) && IsExtEnabled(device_extensions.vk_ext_pageable_device_local_memory)) {
+    if (VendorCheckEnabled(kBPVendorNVIDIA) && IsExtEnabled(extensions.vk_ext_pageable_device_local_memory)) {
         auto mem_info = std::static_pointer_cast<const bp_state::DeviceMemory>(Get<vvl::DeviceMemory>(memory));
         bool has_static_priority = vku::FindStructInPNextChain<VkMemoryPriorityAllocateInfoEXT>(mem_info->allocate_info.pNext);
         if (!mem_info->dynamic_priority && !has_static_priority) {

diff --git a/layers/best_practices/bp_instance_device.cpp b/layers/best_practices/bp_instance_device.cpp
@@ -135,16 +135,16 @@ bool BestPractices::PreCallValidateCreateDevice(VkPhysicalDevice physicalDevice,
                 dev_api_name.c_str());
     }
 
-    std::vector<std::string> extensions;
+    std::vector<std::string> extension_names;
     {
         uint32_t property_count = 0;
         if (DispatchEnumerateDeviceExtensionProperties(physicalDevice, nullptr, &property_count, nullptr) == VK_SUCCESS) {
             std::vector<VkExtensionProperties> property_list(property_count);
             if (DispatchEnumerateDeviceExtensionProperties(physicalDevice, nullptr, &property_count, property_list.data()) ==
                 VK_SUCCESS) {
-                extensions.reserve(property_list.size());
+                extension_names.reserve(property_list.size());
                 for (const VkExtensionProperties& properties : property_list) {
-                    extensions.emplace_back(properties.extensionName);
+                    extension_names.emplace_back(properties.extensionName);
                 }
             }
         }
@@ -183,9 +183,10 @@ bool BestPractices::PreCallValidateCreateDevice(VkPhysicalDevice physicalDevice,
             VendorSpecificTag(kBPVendorArm), VendorSpecificTag(kBPVendorAMD), VendorSpecificTag(kBPVendorIMG));
     }
 
-    const bool enabled_pageable_device_local_memory = IsExtEnabled(device_extensions.vk_ext_pageable_device_local_memory);
+    const bool enabled_pageable_device_local_memory = IsExtEnabled(extensions.vk_ext_pageable_device_local_memory);
     if (VendorCheckEnabled(kBPVendorNVIDIA) && !enabled_pageable_device_local_memory &&
-        std::find(extensions.begin(), extensions.end(), VK_EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_EXTENSION_NAME) != extensions.end()) {
+        std::find(extension_names.begin(), extension_names.end(), VK_EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_EXTENSION_NAME) !=
+            extension_names.end()) {
         skip |=
             LogPerformanceWarning("BestPractices-NVIDIA-CreateDevice-PageableDeviceLocalMemory", instance, error_obj.location,
                                   "%s called without pageable device local memory. "

diff --git a/layers/best_practices/bp_pipeline.cpp b/layers/best_practices/bp_pipeline.cpp
@@ -1,6 +1,6 @@
-/* Copyright (c) 2015-2024 The Khronos Group Inc.
- * Copyright (c) 2015-2024 Valve Corporation
- * Copyright (c) 2015-2024 LunarG, Inc.
+/* Copyright (c) 2015-2025 The Khronos Group Inc.
+ * Copyright (c) 2015-2025 Valve Corporation
+ * Copyright (c) 2015-2025 LunarG, Inc.
  * Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
  * Modifications Copyright (C) 2022 RasterGrid Kft.
  *
@@ -301,7 +301,7 @@ bool BestPractices::PreCallValidateCreateComputePipelines(VkDevice device, VkPip
             skip |= ValidateCreateComputePipelineAmd(create_info, create_info_loc);
         }
 
-        if (IsExtEnabled(device_extensions.vk_khr_maintenance4)) {
+        if (IsExtEnabled(extensions.vk_khr_maintenance4)) {
             auto module_state = Get<vvl::ShaderModule>(create_info.stage.module);
             if (module_state &&
                 module_state->spirv->static_data_.has_builtin_workgroup_size) {  // No module if creating from module identifier

diff --git a/layers/best_practices/bp_render_pass.cpp b/layers/best_practices/bp_render_pass.cpp
@@ -128,7 +128,7 @@ bool BestPractices::PreCallValidateCreateRenderPass(VkDevice device, const VkRen
         }
     }
 
-    if (IsExtEnabled(device_extensions.vk_ext_multisampled_render_to_single_sampled)) {
+    if (IsExtEnabled(extensions.vk_ext_multisampled_render_to_single_sampled)) {
         for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) {
             if (!pCreateInfo->pSubpasses[i].pResolveAttachments) continue;
             for (uint32_t j = 0; j < pCreateInfo->pSubpasses[i].colorAttachmentCount; ++j) {

diff --git a/layers/best_practices/bp_wsi.cpp b/layers/best_practices/bp_wsi.cpp
@@ -1,6 +1,6 @@
-/* Copyright (c) 2015-2024 The Khronos Group Inc.
- * Copyright (c) 2015-2024 Valve Corporation
- * Copyright (c) 2015-2024 LunarG, Inc.
+/* Copyright (c) 2015-2025 The Khronos Group Inc.
+ * Copyright (c) 2015-2025 Valve Corporation
+ * Copyright (c) 2015-2025 LunarG, Inc.
  * Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
  * Modifications Copyright (C) 2022 RasterGrid Kft.
  *
@@ -111,7 +111,7 @@ bool BestPractices::PreCallValidateCreateSwapchainKHR(VkDevice device, const VkS
             pCreateInfo->minImageCount);
     }
 
-    if (IsExtEnabled(device_extensions.vk_ext_swapchain_maintenance1) &&
+    if (IsExtEnabled(extensions.vk_ext_swapchain_maintenance1) &&
         !vku::FindStructInPNextChain<VkSwapchainPresentModesCreateInfoEXT>(pCreateInfo->pNext)) {
         skip |= LogWarning("BestPractices-vkCreateSwapchainKHR-no-VkSwapchainPresentModesCreateInfoEXT-provided", device,
                            error_obj.location,
@@ -344,4 +344,4 @@ void BestPractices::ManualPostCallRecordGetSwapchainImagesKHR(VkDevice device, V
 std::shared_ptr<vvl::Swapchain> BestPractices::CreateSwapchainState(const VkSwapchainCreateInfoKHR* create_info,
                                                                     VkSwapchainKHR handle) {
     return std::static_pointer_cast<vvl::Swapchain>(std::make_shared<bp_state::Swapchain>(*this, create_info, handle));
-}
+}
diff --git a/layers/chassis/chassis_manual.cpp b/layers/chassis/chassis_manual.cpp
@@ -111,7 +111,7 @@ const vvl::unordered_map<std::string, function_data>& GetNameToFuncPtrMap();
 
 VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL GetDeviceProcAddr(VkDevice device, const char* funcName) {
     auto layer_data = vvl::dispatch::GetData(device);
-    if (!ApiParentExtensionEnabled(funcName, &layer_data->device_extensions)) {
+    if (!ApiParentExtensionEnabled(funcName, &layer_data->extensions)) {
         return nullptr;
     }
     const auto& item = GetNameToFuncPtrMap().find(funcName);
@@ -286,10 +286,10 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice gpu, const VkDevice
     // use a unique pointer to make sure we destroy this object on error
     auto device_dispatch = std::make_unique<vvl::dispatch::Device>(instance_dispatch, gpu, pCreateInfo);
 
-    // This is odd but we need to set the current device_extensions in all of the
+    // This is odd but we need to set the current extensions in all of the
     // instance validation objects so that they are available for validating CreateDevice
     for (auto& vo : instance_dispatch->object_dispatch) {
-        vo->device_extensions = device_dispatch->device_extensions;
+        vo->extensions = device_dispatch->extensions;
     }
 
     // Make copy to modify as some ValidationObjects will want to add extensions/features on
@@ -318,8 +318,8 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice gpu, const VkDevice
     record_obj.result = result;
     device_dispatch->device = *pDevice;
     // Save local info in device object
-    device_dispatch->device_extensions = DeviceExtensions(instance_dispatch->instance_extensions, device_dispatch->api_version,
-                                                          reinterpret_cast<VkDeviceCreateInfo*>(&modified_create_info));
+    device_dispatch->extensions = DeviceExtensions(instance_dispatch->extensions, device_dispatch->api_version,
+                                                   reinterpret_cast<VkDeviceCreateInfo*>(&modified_create_info));
     layer_init_device_dispatch_table(*pDevice, &device_dispatch->device_dispatch_table, fpGetDeviceProcAddr);
 
     instance_dispatch->debug_report->device_created++;

diff --git a/layers/chassis/dispatch_object.h b/layers/chassis/dispatch_object.h
@@ -1,8 +1,8 @@
 /***************************************************************************
  *
- * Copyright (c) 2015-2024 The Khronos Group Inc.
- * Copyright (c) 2015-2024 Valve Corporation
- * Copyright (c) 2015-2024 LunarG, Inc.
+ * Copyright (c) 2015-2025 The Khronos Group Inc.
+ * Copyright (c) 2015-2025 Valve Corporation
+ * Copyright (c) 2015-2025 LunarG, Inc.
  * Copyright (c) 2015-2024 Google Inc.
  * Copyright (c) 2023-2024 RasterGrid Kft.
  *
@@ -179,8 +179,7 @@ class Instance : public HandleWrapper {
     Settings settings;
 
     APIVersion api_version;
-    InstanceExtensions instance_extensions;
-    DeviceExtensions device_extensions = {};
+    DeviceExtensions extensions{};
 
     mutable std::vector<std::unique_ptr<ValidationObject>> object_dispatch;
 
@@ -208,7 +207,7 @@ class Device : public HandleWrapper {
     Instance* dispatch_instance;
 
     APIVersion api_version;
-    DeviceExtensions device_extensions = {};
+    DeviceExtensions extensions = {};
 
     VkPhysicalDevice physical_device = VK_NULL_HANDLE;
     VkDevice device = VK_NULL_HANDLE;

diff --git a/layers/chassis/dispatch_object_manual.cpp b/layers/chassis/dispatch_object_manual.cpp
@@ -102,8 +102,8 @@ Instance::Instance(const VkInstanceCreateInfo *pCreateInfo) : HandleWrapper(new
     api_version = VK_MAKE_API_VERSION(VK_API_VERSION_VARIANT(specified_version), VK_API_VERSION_MAJOR(specified_version),
                                       VK_API_VERSION_MINOR(specified_version), 0);
 
-    instance_extensions = InstanceExtensions(specified_version, pCreateInfo);
-    device_extensions = DeviceExtensions(instance_extensions, api_version);
+    InstanceExtensions instance_extensions(specified_version, pCreateInfo);
+    extensions = DeviceExtensions(instance_extensions, api_version);
 
     debug_report->instance_pnext_chain = vku::SafePnextCopy(pCreateInfo->pNext);
     ActivateInstanceDebugCallbacks(debug_report);
@@ -279,7 +279,7 @@ Device::Device(Instance *instance, VkPhysicalDevice gpu, const VkDeviceCreateInf
     // Setup the validation tables based on the application API version from the instance and the capabilities of the device driver
     auto effective_api_version = std::min(APIVersion(device_properties.apiVersion), dispatch_instance->api_version);
 
-    device_extensions = DeviceExtensions(dispatch_instance->instance_extensions, effective_api_version, pCreateInfo);
+    extensions = DeviceExtensions(dispatch_instance->extensions, effective_api_version, pCreateInfo);
 
     InitValidationObjects();
     InitObjectDispatchVectors();

diff --git a/layers/chassis/validation_object.h b/layers/chassis/validation_object.h
@@ -1,8 +1,8 @@
 /***************************************************************************
  *
- * Copyright (c) 2015-2024 The Khronos Group Inc.
- * Copyright (c) 2015-2024 Valve Corporation
- * Copyright (c) 2015-2024 LunarG, Inc.
+ * Copyright (c) 2015-2025 The Khronos Group Inc.
+ * Copyright (c) 2015-2025 Valve Corporation
+ * Copyright (c) 2015-2025 LunarG, Inc.
  * Copyright (c) 2015-2024 Google Inc.
  * Copyright (c) 2023-2024 RasterGrid Kft.
  *
@@ -84,8 +84,7 @@ class ValidationObject : public Logger {
     vvl::dispatch::Instance* dispatch_instance_{};
     vvl::dispatch::Device* dispatch_device_{};
 
-    const InstanceExtensions& instance_extensions;
-    DeviceExtensions device_extensions;
+    DeviceExtensions extensions;
     const GlobalSettings& global_settings;
     GpuAVSettings& gpuav_settings;
     const SyncValSettings& syncval_settings;
@@ -106,8 +105,7 @@ class ValidationObject : public Logger {
           api_version(dev->api_version),
           dispatch_instance_(dev->dispatch_instance),
           dispatch_device_(dev),
-          instance_extensions(dev->dispatch_instance->instance_extensions),
-          device_extensions(dev->device_extensions),
+          extensions(dev->extensions),
           global_settings(dev->settings.global_settings),
           gpuav_settings(dev->settings.gpuav_settings),
           syncval_settings(dev->settings.syncval_settings),
@@ -123,8 +121,7 @@ class ValidationObject : public Logger {
           api_version(instance->api_version),
           dispatch_instance_(instance),
           dispatch_device_(nullptr),
-          instance_extensions(instance->instance_extensions),
-          device_extensions(instance->device_extensions),
+          extensions(instance->extensions),
           global_settings(instance->settings.global_settings),
           gpuav_settings(instance->settings.gpuav_settings),
           syncval_settings(instance->settings.syncval_settings),
@@ -139,12 +136,12 @@ class ValidationObject : public Logger {
 
     void CopyDispatchState() {
         if (dispatch_device_) {
-            device_extensions = dispatch_device_->device_extensions;
+            extensions = dispatch_device_->extensions;
             instance = dispatch_device_->dispatch_instance->instance;
             physical_device = dispatch_device_->physical_device;
             device = dispatch_device_->device;
         } else {
-            device_extensions = dispatch_instance_->device_extensions;
+            extensions = dispatch_instance_->extensions;
             instance = dispatch_instance_->instance;
             physical_device = VK_NULL_HANDLE;
             device = VK_NULL_HANDLE;

diff --git a/layers/core_checks/cc_buffer.cpp b/layers/core_checks/cc_buffer.cpp
@@ -1,6 +1,6 @@
-/* Copyright (c) 2015-2024 The Khronos Group Inc.
- * Copyright (c) 2015-2024 Valve Corporation
- * Copyright (c) 2015-2024 LunarG, Inc.
+/* Copyright (c) 2015-2025 The Khronos Group Inc.
+ * Copyright (c) 2015-2025 Valve Corporation
+ * Copyright (c) 2015-2025 LunarG, Inc.
  * Copyright (C) 2015-2024 Google Inc.
  * Modifications Copyright (C) 2020-2022 Advanced Micro Devices, Inc. All rights reserved.
  *
@@ -498,7 +498,7 @@ bool CoreChecks::PreCallValidateCmdFillBuffer(VkCommandBuffer commandBuffer, VkB
                          FormatHandle(dstBuffer).c_str(), buffer_state->create_info.size, dstOffset);
     }
 
-    if (!IsExtEnabled(device_extensions.vk_khr_maintenance1)) {
+    if (!IsExtEnabled(extensions.vk_khr_maintenance1)) {
         const VkQueueFlags required_flags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT;
         if (!HasRequiredQueueFlags(cb_state, *physical_device_state, required_flags)) {
             const LogObjectList objlist_pool(cb_state.Handle(), cb_state.command_pool->Handle());