Allow layers to expose new extensions

solidpixel · solidpixel · commit d2644db263ec · 2025-12-09T09:53:11.000Z
diff --git a/generator/vk_layer/source/instance.cpp b/generator/vk_layer/source/instance.cpp
@@ -38,12 +38,18 @@ 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::extraDriverExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME
 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::injectedLayerExtensions {};
+const std::vector<std::string> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> Instance::injectedDeviceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> Instance::injectedAPIFunctions {};
 
 /* See header for documentation. */
 void Instance::store(
diff --git a/generator/vk_layer/source/instance.hpp b/generator/vk_layer/source/instance.hpp
@@ -143,12 +143,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed from the underlying driver.
+     * @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::string> extraDriverExtensions;
+    static const std::vector<std::string> injectedInstanceExtensions;
 
     /**
-     * @brief The minimum set of instance extensions injected by the layer.
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::string> 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> injectedLayerExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_example/source/instance.cpp b/layer_example/source/instance.cpp
@@ -38,12 +38,18 @@ 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::extraDriverExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME
 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::injectedLayerExtensions {};
+const std::vector<std::string> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> 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,12 +137,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed from the underlying driver.
+     * @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::string> extraDriverExtensions;
+    static const std::vector<std::string> injectedInstanceExtensions;
 
     /**
-     * @brief The minimum set of instance extensions injected by the layer.
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::string> 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> injectedLayerExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_gpu_profile/source/instance.cpp b/layer_gpu_profile/source/instance.cpp
@@ -38,12 +38,18 @@ 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::extraDriverExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::injectedLayerExtensions {};
+const std::vector<std::string> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> 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,12 +143,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed from the underlying driver.
+     * @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::string> extraDriverExtensions;
+    static const std::vector<std::string> injectedInstanceExtensions;
 
     /**
-     * @brief The minimum set of instance extensions injected by the layer.
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::string> 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> injectedLayerExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_gpu_support/source/instance.cpp b/layer_gpu_support/source/instance.cpp
@@ -38,12 +38,18 @@ 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::extraDriverExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::injectedLayerExtensions {};
+const std::vector<std::string> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> 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,12 +142,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed from the underlying driver.
+     * @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::string> extraDriverExtensions;
+    static const std::vector<std::string> injectedInstanceExtensions;
 
     /**
-     * @brief The minimum set of instance extensions injected by the layer.
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::string> 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> injectedLayerExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/layer_gpu_timeline/source/instance.cpp b/layer_gpu_timeline/source/instance.cpp
@@ -38,12 +38,18 @@ 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::extraDriverExtensions {
+const std::vector<std::string> Instance::requiredDriverExtensions {
     VK_EXT_DEBUG_UTILS_EXTENSION_NAME,
 };
 
 /* See header for documentation. */
-const std::vector<std::string> Instance::injectedLayerExtensions {};
+const std::vector<std::string> Instance::injectedInstanceExtensions {};
+
+/* See header for documentation. */
+const std::vector<std::string> 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,12 +137,34 @@ class Instance
     static const APIVersion minAPIVersion;
 
     /**
-     * @brief The minimum set of instance extensions needed from the underlying driver.
+     * @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::string> extraDriverExtensions;
+    static const std::vector<std::string> injectedInstanceExtensions;
 
     /**
-     * @brief The minimum set of instance extensions injected by the layer.
+     * @brief Additional device extensions injected by the layer.
+     *
+     * The layer will expose these even if the driver does not.
+     */
+    static const std::vector<std::string> 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> injectedLayerExtensions;
+    static const std::vector<std::string> injectedAPIFunctions;
 };
diff --git a/source_common/framework/manual_functions.cpp b/source_common/framework/manual_functions.cpp
@@ -769,7 +769,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::extraDriverExtensions)
+    for (const auto& newExt : Instance::requiredDriverExtensions)
     {
         if (newExt == VK_EXT_DEBUG_UTILS_EXTENSION_NAME)
         {
