From 2c4a47541daff688497aa655ee5493161395ba8c Mon Sep 17 00:00:00 2001 From: bailwillharr Date: Tue, 13 Sep 2022 22:55:08 +0100 Subject: [PATCH] Add volk --- .gitmodules | 3 +++ CMakeLists.txt | 8 ++++++++ dependencies/volk | 1 + src/gfx_device_vulkan.cpp | 5 ++--- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 160000 dependencies/volk diff --git a/.gitmodules b/.gitmodules index d92b0d2..9e12f3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "dependencies/freetype"] path = dependencies/freetype url = https://gitlab.freedesktop.org/freetype/freetype.git +[submodule "dependencies/volk"] + path = dependencies/volk + url = https://github.com/zeux/volk diff --git a/CMakeLists.txt b/CMakeLists.txt index f7ea71b..06e68e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,14 @@ set_property(TARGET glad PROPERTY POSITION_INDEPENDENT_CODE ON) target_link_libraries(${PROJECT_NAME} PUBLIC glad) target_include_directories(${PROJECT_NAME} PUBLIC dependencies/glad/include) +# Volk +set(VOLK_STATIC_DEFINES "") +set(VOLK_PULL_IN_VULKAN ON) +set(VOLK_INSTALL OFF) +set(VOLK_HEADERS_ONLY ON) +add_subdirectory(dependencies/volk) +target_link_libraries(${PROJECT_NAME} PRIVATE volk_headers) + # SDL2: find_package(SDL2) if (SDL2_FOUND) diff --git a/dependencies/volk b/dependencies/volk new file mode 160000 index 0000000..121a458 --- /dev/null +++ b/dependencies/volk @@ -0,0 +1 @@ +Subproject commit 121a4584f69056d2c6db2eb4104650ce749d4c72 diff --git a/src/gfx_device_vulkan.cpp b/src/gfx_device_vulkan.cpp index 7db4f4e..5d062ea 100644 --- a/src/gfx_device_vulkan.cpp +++ b/src/gfx_device_vulkan.cpp @@ -8,7 +8,8 @@ #include "log.hpp" -#include +#define VOLK_IMPLEMENTATION +#include "volk.h" #include @@ -188,8 +189,6 @@ namespace engine::gfx { #endif } - - };