Make device extensions configurable

ARM-software · Jan 20, 2025 · b814cd1 · b814cd1
1 parent 6f708e6
commit b814cd1
Show file tree

Hide file tree

Showing 9 changed files with 176 additions and 105 deletions.
diff --git a/generator/vk_layer/source/device.cpp b/generator/vk_layer/source/device.cpp
@@ -39,6 +39,9 @@
  */
 static std::unordered_map<void*, std::unique_ptr<Device>> g_devices;
 
+/* See header for documentation. */
+const std::vector<std::string> Device::extraExtensions { };
+
 /* See header for documentation. */
 void Device::store(
     VkDevice handle,

diff --git a/generator/vk_layer/source/device.hpp b/generator/vk_layer/source/device.hpp
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: MIT
  * ----------------------------------------------------------------------------
- * Copyright (c) 2024 Arm Limited
+ * Copyright (c) 2024-2025 Arm Limited
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -132,6 +132,17 @@ class Device
     ~Device() = default;
 
 public:
+    /**
+     * @brief The driver function dispatch table.
+     */
+    DeviceDispatchTable driver {};
+
+    /**
+     * @brief The minimum set of device extensions needed by this layer.
+     */
+    static const std::vector<std::string> extraExtensions;
+
+private:
     /**
      * @brief The instance this device is created with.
      */
@@ -146,9 +157,4 @@ class Device
      * @brief The device handle this device is created with.
      */
     const VkDevice device;
-
-    /**
-     * @brief The driver function dispatch table.
-     */
-    DeviceDispatchTable driver {};
 };
diff --git a/layer_example/source/device.cpp b/layer_example/source/device.cpp
@@ -39,6 +39,9 @@
  */
 static std::unordered_map<void*, std::unique_ptr<Device>> g_devices;
 
+/* See header for documentation. */
+const std::vector<std::string> Device::extraExtensions { };
+
 /* See header for documentation. */
 void Device::store(
     VkDevice handle,

diff --git a/layer_example/source/device.hpp b/layer_example/source/device.hpp
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: MIT
  * ----------------------------------------------------------------------------
- * Copyright (c) 2024 Arm Limited
+ * Copyright (c) 2024-2025 Arm Limited
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -132,6 +132,17 @@ class Device
     ~Device() = default;
 
 public:
+    /**
+     * @brief The driver function dispatch table.
+     */
+    DeviceDispatchTable driver {};
+
+    /**
+     * @brief The minimum set of device extensions needed by this layer.
+     */
+    static const std::vector<std::string> extraExtensions;
+
+private:
     /**
      * @brief The instance this device is created with.
      */
@@ -146,9 +157,4 @@ class Device
      * @brief The device handle this device is created with.
      */
     const VkDevice device;
-
-    /**
-     * @brief The driver function dispatch table.
-     */
-    DeviceDispatchTable driver {};
 };
diff --git a/layer_gpu_support/source/device.cpp b/layer_gpu_support/source/device.cpp
@@ -33,6 +33,11 @@
  */
 static std::unordered_map<void*, std::unique_ptr<Device>> g_devices;
 
+/* See header for documentation. */
+const std::vector<std::string> Device::extraExtensions {
+    "VK_KHR_timeline_semaphore"
+};
+
 /* See header for documentation. */
 void Device::store(
     VkDevice handle,

diff --git a/layer_gpu_support/source/device.hpp b/layer_gpu_support/source/device.hpp
@@ -132,6 +132,17 @@ class Device
     ~Device() = default;
 
 public:
+    /**
+     * @brief The driver function dispatch table.
+     */
+    DeviceDispatchTable driver {};
+
+    /**
+     * @brief The minimum set of device extensions needed by this layer.
+     */
+    static const std::vector<std::string> extraExtensions;
+
+private:
     /**
      * @brief The instance this device is created with.
      */
@@ -146,9 +157,4 @@ class Device
      * @brief The device handle this device is created with.
      */
     const VkDevice device;
-
-    /**
-     * @brief The driver function dispatch table.
-     */
-    DeviceDispatchTable driver {};
 };
diff --git a/layer_gpu_timeline/source/device.cpp b/layer_gpu_timeline/source/device.cpp
@@ -40,6 +40,9 @@
  */
 static std::unordered_map<void*, std::unique_ptr<Device>> g_devices;
 
+/* See header for documentation. */
+const std::vector<std::string> Device::extraExtensions { };
+
 /* See header for documentation. */
 std::unique_ptr<Comms::CommsModule> Device::commsModule;
 

diff --git a/layer_gpu_timeline/source/device.hpp b/layer_gpu_timeline/source/device.hpp
@@ -170,6 +170,11 @@ class Device
      */
     DeviceDispatchTable driver {};
 
+    /**
+     * @brief The minimum set of device extensions needed by this layer.
+     */
+    static const std::vector<std::string> extraExtensions;
+
 private:
     /**
      * @brief The instance this device is created with.