wip

LDAP · Nov 10, 2024 · 70a0c3b · 70a0c3b
1 parent ed8876a
commit 70a0c3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/include/merian/vk/context.hpp b/include/merian/vk/context.hpp
@@ -94,8 +94,8 @@ class Context : public std::enable_shared_from_this<Context> {
     create(const std::vector<std::shared_ptr<Extension>>& extensions,
            const std::string& application_name = "",
            uint32_t application_vk_version = VK_MAKE_VERSION(1, 0, 0),
-           uint32_t vk_api_version = VK_API_VERSION_1_3,
            uint32_t preffered_number_compute_queues = 1, // Additionally to the GCT queue
+           uint32_t vk_api_version = VK_API_VERSION_1_3,
            uint32_t filter_vendor_id = -1,
            uint32_t filter_device_id = -1,
            const std::string& filter_device_name = "");
@@ -104,8 +104,8 @@ class Context : public std::enable_shared_from_this<Context> {
     Context(const std::vector<std::shared_ptr<Extension>>& extensions,
             const std::string& application_name,
             uint32_t application_vk_version,
-            uint32_t vk_api_version,
             uint32_t preffered_number_compute_queues,
+            uint32_t vk_api_version,
             uint32_t filter_vendor_id,
             uint32_t filter_device_id,
             const std::string& filter_device_name);

diff --git a/include/merian/vk/extension/extension.hpp b/include/merian/vk/extension/extension.hpp
@@ -62,11 +62,13 @@ class Extension {
      * Vote against a physical device by returning false. The context attemps to select a physical
      * device that is accepted by most extensions, meaning this is not a hard criteria and you
      * should check support in "extension_supported" again!
+     * 
+     * The default implementation checks if the desired device extensions are supported.
      */
     virtual bool
     accept_physical_device([[maybe_unused]] const vk::PhysicalDevice& physical_device,
                            [[maybe_unused]] const vk::PhysicalDeviceProperties2& props) {
-        return true;
+        return ;
     }
 
     /* Called after the physical device was select and before extensions are checked for

diff --git a/src/merian/vk/context.cpp b/src/merian/vk/context.cpp
@@ -15,8 +15,8 @@ namespace merian {
 ContextHandle Context::create(const std::vector<std::shared_ptr<Extension>>& extensions,
                               const std::string& application_name,
                               uint32_t application_vk_version,
-                              uint32_t vk_api_version,
                               uint32_t preffered_number_compute_queues,
+                              uint32_t vk_api_version,
                               uint32_t filter_vendor_id,
                               uint32_t filter_device_id,
                               const std::string& filter_device_name) {
@@ -37,8 +37,8 @@ ContextHandle Context::create(const std::vector<std::shared_ptr<Extension>>& ext
 Context::Context(const std::vector<std::shared_ptr<Extension>>& desired_extensions,
                  const std::string& application_name,
                  uint32_t application_vk_version,
-                 uint32_t vk_api_version,
                  uint32_t preffered_number_compute_queues,
+                 uint32_t vk_api_version,
                  uint32_t filter_vendor_id,
                  uint32_t filter_device_id,
                  const std::string& filter_device_name)