Use volk

Author: floppyhammer

.gitmodules

@@ -17,3 +17,7 @@
 
 # Set branch:
 # git submodule set-branch --branch [BRANCH_NAME] [SUBMODULE_PATH]
+[submodule "third_party/volk"]
+	path = third_party/volk
+	url = https://github.com/zeux/volk.git
+	branch = vulkan-sdk-1.4.341

CMakeLists.txt

@@ -61,14 +61,24 @@ endif ()
 if (PATHFINDER_BACKEND_VULKAN)
     message("[Pathfinder] Enabled Vulkan backend")
 
-    find_package(Vulkan REQUIRED)
-
-    target_link_libraries(pathfinder PUBLIC Vulkan::Vulkan)
+    # Load Vulkan dll
+    #    find_package(Vulkan REQUIRED)
+    #
+    #    target_link_libraries(pathfinder PUBLIC Vulkan::Vulkan)
+    #
+    #    # This is to please GitHub Actions.
+    #    target_include_directories(pathfinder PUBLIC "${Vulkan_INCLUDE_DIRS}")
+    #
+
+    # Load Vulkan dynamically
+    if (ANDROID)
+        # Prevent crash at vkCreateAndroidSurfaceKHR.
+        set(VOLK_STATIC_DEFINES VK_USE_PLATFORM_ANDROID_KHR)
+    endif ()
 
-    # This is to please GitHub Actions.
-    target_include_directories(pathfinder PUBLIC "${Vulkan_INCLUDE_DIRS}")
+    add_subdirectory("third_party/volk")
+    target_link_libraries(pathfinder PUBLIC volk)
 
-    # Don't use add_compile_definitions, which doesn't propagate to parent projects.
     target_compile_definitions(pathfinder PRIVATE PATHFINDER_USE_VULKAN)
 
     # Enable this for Vulkan 1.3 and higher on macOS.

demo/android/app/src/main/cpp/AndroidMain.cpp

@@ -10,7 +10,7 @@ void handle_cmd(android_app *app, int32_t cmd) {
         case APP_CMD_INIT_WINDOW:
             // The window is being shown, get it ready.
             native_engine = new NativeEngine(app);
-            native_engine->init_app(false);
+            native_engine->init_app(true);
             break;
         case APP_CMD_TERM_WINDOW:
             // The window is being hidden or closed, clean it up.

demo/android/app/src/main/cpp/CMakeLists.txt

@@ -23,7 +23,6 @@ link_directories(lib/${ANDROID_ABI})
 
 add_library(${CMAKE_PROJECT_NAME} SHARED
         AndroidMain.cpp
-        vulkan_wrapper.cpp
         GameActivitySources.cpp
         native_engine.cpp)
 

demo/android/app/src/main/cpp/native_engine.cpp

@@ -1,7 +1,7 @@
 #include "native_engine.h"
 
 // clang-format off
-#include "vulkan_wrapper.h"
+#include <volk/volk.h>
 #include "pathfinder/gpu/gl/window_builder.h"
 #include "pathfinder/gpu/vk/window_builder.h"
 // clang-format on
@@ -83,11 +83,6 @@ bool NativeEngine::init_app(bool use_vulkan) {
     if (!use_vulkan) {
         window_builder = std::make_shared<Pathfinder::WindowBuilderGl>(mAppCtx->window, window_size);
     } else {
-        if (!InitVulkan()) {
-            Pathfinder::Logger::warn("Vulkan is unavailable, install vulkan and re-start");
-            return false;
-        }
-
         window_builder = std::make_shared<Pathfinder::WindowBuilderVk>(mAppCtx->window, window_size);
     }
 

demo/android/app/src/main/cpp/vulkan_wrapper.cpp

@@ -13,8 +13,7 @@
     #endif
 
     #ifdef PATHFINDER_USE_VULKAN
-        // Vulkan header.
-        #include "vulkan_wrapper.h"
+        #include <volk/volk.h>
     #endif
 
 #elif defined(__EMSCRIPTEN__)
@@ -24,18 +23,17 @@
 
     #ifdef PATHFINDER_USE_OPENGL
         #if defined(__linux__) && defined(__ARM_ARCH) || (defined(_WIN32) && defined(_M_ARM64))
-        // Include OpenGL ES header via GLAD.
-        #include <glad/gles2.h>
-    #else
-        // Include OpenGL header via GLAD.
-        #include <glad/gl.h>
-    #endif
-    #define GLFW_INCLUDE_NONE
+            // Include OpenGL ES header via GLAD.
+            #include <glad/gles2.h>
+        #else
+            // Include OpenGL header via GLAD.
+            #include <glad/gl.h>
+        #endif
+        #define GLFW_INCLUDE_NONE
     #endif
 
     #ifdef PATHFINDER_USE_VULKAN
-        #define GLFW_INCLUDE_VULKAN
-        #include <vulkan/vulkan.h>
+        #include <volk/volk.h>
     #endif
 
     #include <GLFW/glfw3.h>

demo/android/app/src/main/cpp/vulkan_wrapper.h

@@ -37,6 +37,8 @@ WindowBuilderVk::WindowBuilderVk(const Vec2I &logical_size) {
 
     create_instance();
 
+    volkLoadInstance(instance_);
+
     setup_debug_messenger();
 
     float dpi_scaling_factor;
@@ -58,6 +60,8 @@ WindowBuilderVk::WindowBuilderVk(ANativeWindow *native_window, const Vec2I &phys
 
     create_instance();
 
+    volkLoadInstance(instance_);
+
     setup_debug_messenger();
 
     VkSurfaceKHR surface{};

pathfinder/gpu/render_api.h

@@ -4,6 +4,7 @@
 #include <memory>
 #include <vector>
 
+#include "../render_api.h"
 #include "../window.h"
 #include "../window_builder.h"
 #include "device.h"