igl | vulkan | Merge VulkanFunctions.cpp/.h into Common.cpp/.h

Summary: `VulkanFunctions.h` is always included together with `Common.h`. Merge them so we can get rid of an extra module burden and improve compilation time. Reviewed By: rokuz, mmaurer Differential Revision: D61736454 fbshipit-source-id: 2ba93e0f9ff196a43721af1c7cfc8bd59dd43040
facebook · Aug 27, 2024 · 8c591a7 · 8c591a7
1 parent 54a7f26
commit 8c591a7
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 108 deletions.
diff --git a/src/igl/vulkan/Common.cpp b/src/igl/vulkan/Common.cpp
@@ -12,9 +12,16 @@
 #include <cstdio>
 #include <cstdlib>
 
+// clang-format off
 #if defined(VK_USE_PLATFORM_WIN32_KHR)
-#include <windows.h>
+  #ifndef WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
+  #endif
+  #include <windows.h>
+#else
+  #include <dlfcn.h>
 #endif
+// clang-format on
 
 #include <igl/vulkan/ShaderModule.h>
 #include <igl/vulkan/Texture.h>
@@ -641,3 +648,58 @@ uint32_t getNumImagePlanes(VkFormat format) {
   }
 }
 } // namespace igl::vulkan
+
+namespace igl::vulkan::functions {
+
+namespace {
+PFN_vkGetInstanceProcAddr getVkGetInstanceProcAddr() {
+#if defined(_WIN32)
+  HMODULE lib = LoadLibraryA("vulkan-1.dll");
+  if (!lib) {
+    return nullptr;
+  }
+  return (PFN_vkGetInstanceProcAddr)GetProcAddress(lib, "vkGetInstanceProcAddr");
+#elif defined(__APPLE__)
+  void* lib = dlopen("libvulkan.dylib", RTLD_NOW | RTLD_LOCAL);
+  if (!lib) {
+    lib = dlopen("libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL);
+  }
+  if (!lib) {
+    lib = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
+  }
+  if (!lib) {
+    return nullptr;
+  }
+  return (PFN_vkGetInstanceProcAddr)dlsym(lib, "vkGetInstanceProcAddr");
+#else
+  void* lib = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
+  if (!lib) {
+    lib = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
+  }
+  if (!lib) {
+    return nullptr;
+  }
+  return (PFN_vkGetInstanceProcAddr)dlsym(lib, "vkGetInstanceProcAddr");
+#endif
+  return nullptr;
+}
+} // namespace
+
+void initialize(VulkanFunctionTable& table) {
+  table.vkGetInstanceProcAddr = getVkGetInstanceProcAddr();
+  IGL_ASSERT(table.vkGetInstanceProcAddr != nullptr);
+
+  loadVulkanLoaderFunctions(&table, table.vkGetInstanceProcAddr);
+}
+
+void loadInstanceFunctions(VulkanFunctionTable& table, VkInstance instance) {
+  IGL_ASSERT(table.vkGetInstanceProcAddr != nullptr);
+  loadVulkanInstanceFunctions(&table, instance, table.vkGetInstanceProcAddr);
+}
+
+void loadDeviceFunctions(VulkanFunctionTable& table, VkDevice device) {
+  IGL_ASSERT(table.vkGetDeviceProcAddr != nullptr);
+  loadVulkanDeviceFunctions(&table, device, table.vkGetDeviceProcAddr);
+}
+
+} // namespace igl::vulkan::functions
diff --git a/src/igl/vulkan/Common.h b/src/igl/vulkan/Common.h
@@ -196,4 +196,12 @@ void ensureShaderModule(IShaderModule* sm);
 
 } // namespace igl::vulkan
 
+namespace igl::vulkan::functions {
+
+void initialize(VulkanFunctionTable& table);
+void loadInstanceFunctions(VulkanFunctionTable& table, VkInstance instance);
+void loadDeviceFunctions(VulkanFunctionTable& table, VkDevice device);
+
+} // namespace igl::vulkan::functions
+
 #endif // IGL_VULKAN_COMMON_H
diff --git a/src/igl/vulkan/VulkanCommandPool.h b/src/igl/vulkan/VulkanCommandPool.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 
 namespace igl::vulkan {
 

diff --git a/src/igl/vulkan/VulkanContext.h b/src/igl/vulkan/VulkanContext.h
@@ -18,7 +18,6 @@
 #include <igl/vulkan/VulkanDevice.h>
 #include <igl/vulkan/VulkanExtensions.h>
 #include <igl/vulkan/VulkanFeatures.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 #include <igl/vulkan/VulkanImmediateCommands.h>
 #include <igl/vulkan/VulkanQueuePool.h>

diff --git a/src/igl/vulkan/VulkanDescriptorSetLayout.h b/src/igl/vulkan/VulkanDescriptorSetLayout.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <igl/vulkan/VulkanContext.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 #include <memory>
 

diff --git a/src/igl/vulkan/VulkanDevice.h b/src/igl/vulkan/VulkanDevice.h
@@ -10,7 +10,6 @@
 #include <memory>
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 
 namespace igl::vulkan {

diff --git a/src/igl/vulkan/VulkanExtensions.h b/src/igl/vulkan/VulkanExtensions.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 
 namespace igl::vulkan {

diff --git a/src/igl/vulkan/VulkanFence.h b/src/igl/vulkan/VulkanFence.h
@@ -10,7 +10,6 @@
 #include <memory>
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 
 namespace igl::vulkan {

diff --git a/src/igl/vulkan/VulkanFunctions.cpp b/src/igl/vulkan/VulkanFunctions.cpp
diff --git a/src/igl/vulkan/VulkanFunctions.h b/src/igl/vulkan/VulkanFunctions.h
diff --git a/src/igl/vulkan/VulkanPipelineBuilder.h b/src/igl/vulkan/VulkanPipelineBuilder.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 #include <vector>
 

diff --git a/src/igl/vulkan/VulkanQueuePool.h b/src/igl/vulkan/VulkanQueuePool.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 
 namespace igl::vulkan {
 

diff --git a/src/igl/vulkan/VulkanRenderPassBuilder.h b/src/igl/vulkan/VulkanRenderPassBuilder.h
@@ -9,7 +9,6 @@
 
 #include <igl/vulkan/Common.h>
 
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 #include <vector>
 

diff --git a/src/igl/vulkan/VulkanSemaphore.h b/src/igl/vulkan/VulkanSemaphore.h
@@ -10,7 +10,6 @@
 #include <memory>
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 
 namespace igl::vulkan {

diff --git a/src/igl/vulkan/VulkanShaderModule.h b/src/igl/vulkan/VulkanShaderModule.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include <igl/vulkan/Common.h>
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 #include <igl/vulkan/util/SpvReflection.h>