Allow layers to expose new extensions

solidpixel · solidpixel · commit 8b32900b7fc5 · 2025-12-10T21:09:46.000Z
diff --git a/generator/vk_layer/source/instance.cpp b/generator/vk_layer/source/instance.cpp
@@ -38,10 +38,19 @@ static std::unordered_map<void*, std::unique_ptr<Instance>> g_instances;
 const APIVersion Instance::minAPIVersion { 1, 1 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::extraExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME
 };
 
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedDeviceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> Instance::injectedAPIFunctions {};
+
 /* See header for documentation. */
 void Instance::store(
     VkInstance handle,
diff --git a/generator/vk_layer/source/instance.hpp b/generator/vk_layer/source/instance.hpp
@@ -143,7 +143,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed by this layer.
+     * @brief Required extensions from the driver.
+     *
+     * The layer will attempt to enable these even if the application does not.
+     */
+    static const std::vector<std::string> requiredDriverExtensions;
+
+    /**
+     * @brief Additional instance  extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedInstanceExtensions;
+
+    /**
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedDeviceExtensions;
+
+    /**
+     * @brief Additional API functions that are injected by the layer.
+     *
+     * This list must include both instance and device functions, because
+     * vkGetInstanceProcAddr can (inefficiently) be used to return device
+     * functions.
+     *
+     * The layer will expose these even if the driver does not.
      */
-    static const std::vector<std::string> extraExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_example/source/instance.cpp b/layer_example/source/instance.cpp
@@ -35,10 +35,21 @@
 static std::unordered_map<void*, std::unique_ptr<Instance>> g_instances;
 
 /* See header for documentation. */
-const APIVersion Instance::minAPIVersion {1, 1};
+const APIVersion Instance::minAPIVersion { 1, 1 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::extraExtensions {VK_EXT_DEBUG_UTILS_EXTENSION_NAME};
+const std::vector<std::string> Instance::requiredDriverExtensions {
+    VK_EXT_DEBUG_UTILS_EXTENSION_NAME
+};
+
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedDeviceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> Instance::injectedAPIFunctions {};
 
 /* See header for documentation. */
 void Instance::store(VkInstance handle, std::unique_ptr<Instance>& instance)
diff --git a/layer_example/source/instance.hpp b/layer_example/source/instance.hpp
@@ -137,7 +137,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed by this layer.
+     * @brief Required extensions from the driver.
+     *
+     * The layer will attempt to enable these even if the application does not.
+     */
+    static const std::vector<std::string> requiredDriverExtensions;
+
+    /**
+     * @brief Additional instance  extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedInstanceExtensions;
+
+    /**
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedDeviceExtensions;
+
+    /**
+     * @brief Additional API functions that are injected by the layer.
+     *
+     * This list must include both instance and device functions, because
+     * vkGetInstanceProcAddr can (inefficiently) be used to return device
+     * functions.
+     *
+     * The layer will expose these even if the driver does not.
      */
-    static const std::vector<std::string> extraExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_gpu_profile/source/instance.cpp b/layer_gpu_profile/source/instance.cpp
@@ -35,13 +35,22 @@
 static std::unordered_map<void*, std::unique_ptr<Instance>> g_instances;
 
 /* See header for documentation. */
-const APIVersion Instance::minAPIVersion {1, 1};
+const APIVersion Instance::minAPIVersion { 1, 1 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::extraExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 };
 
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedDeviceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> Instance::injectedAPIFunctions {};
+
 /* See header for documentation. */
 void Instance::store(VkInstance handle, std::unique_ptr<Instance>& instance)
 {
diff --git a/layer_gpu_profile/source/instance.hpp b/layer_gpu_profile/source/instance.hpp
@@ -143,7 +143,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed by this layer.
+     * @brief Required extensions from the driver.
+     *
+     * The layer will attempt to enable these even if the application does not.
+     */
+    static const std::vector<std::string> requiredDriverExtensions;
+
+    /**
+     * @brief Additional instance  extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedInstanceExtensions;
+
+    /**
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedDeviceExtensions;
+
+    /**
+     * @brief Additional API functions that are injected by the layer.
+     *
+     * This list must include both instance and device functions, because
+     * vkGetInstanceProcAddr can (inefficiently) be used to return device
+     * functions.
+     *
+     * The layer will expose these even if the driver does not.
      */
-    static const std::vector<std::string> extraExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_gpu_support/source/instance.cpp b/layer_gpu_support/source/instance.cpp
@@ -35,13 +35,22 @@
 static std::unordered_map<void*, std::unique_ptr<Instance>> g_instances;
 
 /* See header for documentation. */
-const APIVersion Instance::minAPIVersion {1, 1};
+const APIVersion Instance::minAPIVersion { 1, 1 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::extraExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 };
 
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedDeviceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> Instance::injectedAPIFunctions {};
+
 /* See header for documentation. */
 void Instance::store(VkInstance handle, std::unique_ptr<Instance>& instance)
 {
diff --git a/layer_gpu_support/source/instance.hpp b/layer_gpu_support/source/instance.hpp
@@ -142,7 +142,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed by this layer.
+     * @brief Required extensions from the driver.
+     *
+     * The layer will attempt to enable these even if the application does not.
+     */
+    static const std::vector<std::string> requiredDriverExtensions;
+
+    /**
+     * @brief Additional instance  extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedInstanceExtensions;
+
+    /**
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedDeviceExtensions;
+
+    /**
+     * @brief Additional API functions that are injected by the layer.
+     *
+     * This list must include both instance and device functions, because
+     * vkGetInstanceProcAddr can (inefficiently) be used to return device
+     * functions.
+     *
+     * The layer will expose these even if the driver does not.
      */
-    static const std::vector<std::string> extraExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_gpu_timeline/source/instance.cpp b/layer_gpu_timeline/source/instance.cpp
@@ -35,13 +35,22 @@
 static std::unordered_map<void*, std::unique_ptr<Instance>> g_instances;
 
 /* See header for documentation. */
-const APIVersion Instance::minAPIVersion {1, 1};
+const APIVersion Instance::minAPIVersion { 1, 1 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::extraExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 };
 
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::pair<std::string, uint32_t>> Instance::injectedDeviceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> Instance::injectedAPIFunctions {};
+
 /* See header for documentation. */
 void Instance::store(VkInstance handle, std::unique_ptr<Instance>& instance)
 {
diff --git a/layer_gpu_timeline/source/instance.hpp b/layer_gpu_timeline/source/instance.hpp
@@ -137,7 +137,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed by this layer.
+     * @brief Required extensions from the driver.
+     *
+     * The layer will attempt to enable these even if the application does not.
+     */
+    static const std::vector<std::string> requiredDriverExtensions;
+
+    /**
+     * @brief Additional instance  extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedInstanceExtensions;
+
+    /**
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::pair<std::string, uint32_t>> injectedDeviceExtensions;
+
+    /**
+     * @brief Additional API functions that are injected by the layer.
+     *
+     * This list must include both instance and device functions, because
+     * vkGetInstanceProcAddr can (inefficiently) be used to return device
+     * functions.
+     *
+     * The layer will expose these even if the driver does not.
      */
-    static const std::vector<std::string> extraExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/source_common/framework/manual_functions.cpp b/source_common/framework/manual_functions.cpp
@@ -381,7 +381,9 @@ std::vector<const char*> cloneExtensionList(uint32_t extensionCount, const char*
 static void enableInstanceVkExtDebugUtils(vku::safe_VkInstanceCreateInfo& createInfo,
                                           const std::vector<std::string>& supported)
 {
-    static const std::string target {VK_EXT_DEBUG_UTILS_EXTENSION_NAME};
+    static const std::string target {
+        VK_EXT_DEBUG_UTILS_EXTENSION_NAME
+    };
 
     // Test if the desired extension is supported. If supported list is
     // empty then we didn't query and assume extension is supported.
@@ -411,7 +413,9 @@ void enableDeviceVkKhrTimelineSemaphore(Instance& instance,
     UNUSED(instance);
     UNUSED(physicalDevice);
 
-    static const std::string target {VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME};
+    static const std::string target {
+        VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME
+    };
 
     // We know we can const-cast here because createInfo is a safe-struct clone
     void* pNextBase = const_cast<void*>(createInfo.pNext);
@@ -766,7 +770,7 @@ VKAPI_ATTR VkResult VKAPI_CALL layer_vkCreateInstance<default_tag>(const VkInsta
     newCreateInfoSafe.pApplicationInfo->apiVersion = VK_MAKE_API_VERSION(0, newVersion.first, newVersion.second, 0);
 
     // Enable extra extensions
-    for (const auto& newExt : Instance::extraExtensions)
+    for (const auto& newExt : Instance::requiredDriverExtensions)
     {
         if (newExt == VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
         {
