thirdpartymirrors/lsfg-vk
1
0
Fork 0
mirror of https://github.com/PancakeTAS/lsfg-vk.git synced 2025-10-30 07:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: use volk rather than Vulkan linkage

Browse source
This commit is contained in:
PancakeTAS 2025-07-24 17:43:22 +02:00 • committed by Pancake
parent 308c5789b7
commit f24263b83b
34 changed files with 103 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -7,3 +7,6 @@
[submodule "thirdparty/toml11"]
path = thirdparty/toml11
url = https://github.com/ToruNiina/toml11
[submodule "thirdparty/volk"]
path = thirdparty/volk
url = https://github.com/zeux/volk

3
CMakeLists.txt
View file

@ -19,6 +19,7 @@ set(GLFW_BUILD_X11 ON)
add_subdirectory(thirdparty/dxbc EXCLUDE_FROM_ALL)
add_subdirectory(thirdparty/pe-parse/pe-parser-library EXCLUDE_FROM_ALL)
add_subdirectory(thirdparty/toml11 EXCLUDE_FROM_ALL)
add_subdirectory(thirdparty/volk EXCLUDE_FROM_ALL)
add_subdirectory(framegen)
# main project
@ -45,7 +46,7 @@ target_include_directories(lsfg-vk
PRIVATE include)
target_link_libraries(lsfg-vk PRIVATE
pe-parse dxbc toml11 SPIRV-Headers
lsfg-vk-framegen vulkan
lsfg-vk-framegen
-static-libstdc++ -static-libgcc)
get_target_property(TOML11_INCLUDE_DIRS toml11 INTERFACE_INCLUDE_DIRECTORIES)

2
framegen/CMakeLists.txt
View file

@ -34,7 +34,7 @@ target_include_directories(lsfg-vk-framegen
PRIVATE v3.1_include
PRIVATE v3.1p_include)
target_link_libraries(lsfg-vk-framegen
PUBLIC vulkan)
PUBLIC volk)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set_target_properties(lsfg-vk-framegen PROPERTIES

5
framegen/src/common/utils.cpp
View file

@ -1,3 +1,6 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "common/utils.hpp"
#include "core/buffer.hpp"
#include "core/image.hpp"
@ -6,8 +9,6 @@
#include "core/fence.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <cstdint>
#include <cerrno>
#include <cstdlib>

5
framegen/src/core/buffer.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/buffer.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <algorithm>
#include <cstdint>
#include <memory>

5
framegen/src/core/commandbuffer.cpp
View file

@ -1,3 +1,6 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/commandbuffer.hpp"
#include "core/device.hpp"
#include "core/commandpool.hpp"
@ -5,8 +8,6 @@
#include "core/semaphore.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <memory>
#include <stdexcept>
#include <cstdint>

5
framegen/src/core/commandpool.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/commandpool.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <memory>
using namespace LSFG::Core;

5
framegen/src/core/descriptorpool.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/descriptorpool.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <array>
#include <cstdint>
#include <memory>

5
framegen/src/core/descriptorset.cpp
View file

@ -1,3 +1,6 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/descriptorset.hpp"
#include "core/device.hpp"
#include "core/descriptorpool.hpp"
@ -9,8 +12,6 @@
#include "core/buffer.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <memory>
#include <cstdint>

7
framegen/src/core/device.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/device.hpp"
#include "core/instance.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <cstdint>
#include <memory>
#include <optional>
@ -97,6 +98,8 @@ Device::Device(const Instance& instance, uint64_t deviceUUID) {
if (res != VK_SUCCESS | deviceHandle == VK_NULL_HANDLE)
throw LSFG::vulkan_error(res, "Failed to create logical device");
volkLoadDevice(deviceHandle);
// get compute queue
VkQueue queueHandle{};
vkGetDeviceQueue(deviceHandle, *computeFamilyIdx, 0, &queueHandle);

5
framegen/src/core/fence.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/fence.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <memory>
#include <cstdint>

5
framegen/src/core/image.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/image.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <cstdint>
#include <memory>
#include <optional>

8
framegen/src/core/instance.cpp
View file

@ -1,10 +1,12 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/instance.hpp"
#include "common/exception.hpp"
#include <cstdint>
#include <memory>
#include <vector>
#include <vulkan/vulkan_core.h>
using namespace LSFG::Core;
@ -13,6 +15,8 @@ const std::vector<const char*> requiredExtensions = {
};
Instance::Instance() {
volkInitialize();
// create Vulkan instance
const VkApplicationInfo appInfo{
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
@ -33,6 +37,8 @@ Instance::Instance() {
if (res != VK_SUCCESS)
throw LSFG::vulkan_error(res, "Failed to create Vulkan instance");
volkLoadInstance(instanceHandle);
// store in shared ptr
this->instance = std::shared_ptr<VkInstance>(
new VkInstance(instanceHandle),

5
framegen/src/core/pipeline.cpp
View file

@ -1,11 +1,12 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/pipeline.hpp"
#include "core/device.hpp"
#include "core/shadermodule.hpp"
#include "core/commandbuffer.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <memory>
using namespace LSFG::Core;

5
framegen/src/core/sampler.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/sampler.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <memory>
using namespace LSFG::Core;

5
framegen/src/core/semaphore.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/semaphore.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <optional>
#include <cstdint>
#include <memory>

5
framegen/src/core/shadermodule.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "core/shadermodule.hpp"
#include "core/device.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <vector>
#include <cstdint>
#include <utility>

5
framegen/v3.1_src/context.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1/context.hpp"
#include "common/utils.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <vector>
#include <cstddef>
#include <algorithm>

5
framegen/v3.1_src/lsfg.cpp
View file

@ -1,3 +1,6 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "lsfg_3_1.hpp"
#include "v3_1/context.hpp"
#include "core/commandpool.hpp"
@ -7,8 +10,6 @@
#include "common/exception.hpp"
#include "common/utils.hpp"
#include <vulkan/vulkan_core.h>
#include <cstdint>
#include <optional>
#include <cstdlib>

5
framegen/v3.1_src/shaders/alpha.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1/shaders/alpha.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <utility>
#include <cstddef>
#include <cstdint>

5
framegen/v3.1_src/shaders/beta.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1/shaders/beta.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <array>
#include <utility>
#include <cstddef>

5
framegen/v3.1_src/shaders/delta.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1/shaders/delta.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <array>
#include <optional>
#include <utility>

5
framegen/v3.1_src/shaders/gamma.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1/shaders/gamma.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <array>
#include <optional>
#include <utility>

5
framegen/v3.1_src/shaders/generate.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1/shaders/generate.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <vector>
#include <utility>
#include <cstddef>

5
framegen/v3.1_src/shaders/mipmaps.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1/shaders/mipmaps.hpp"
#include "common/utils.hpp"
#include "core/image.hpp"
#include "core/commandbuffer.hpp"
#include <vulkan/vulkan_core.h>
#include <utility>
#include <cstddef>
#include <cstdint>

5
framegen/v3.1p_src/context.cpp
View file

@ -1,9 +1,10 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1p/context.hpp"
#include "common/utils.hpp"
#include "common/exception.hpp"
#include <vulkan/vulkan_core.h>
#include <vector>
#include <cstddef>
#include <algorithm>

5
framegen/v3.1p_src/lsfg.cpp
View file

@ -1,3 +1,6 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "lsfg_3_1p.hpp"
#include "v3_1p/context.hpp"
#include "core/commandpool.hpp"
@ -7,8 +10,6 @@
#include "common/exception.hpp"
#include "common/utils.hpp"
#include <vulkan/vulkan_core.h>
#include <cstdint>
#include <optional>
#include <cstdlib>

5
framegen/v3.1p_src/shaders/alpha.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1p/shaders/alpha.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <utility>
#include <cstddef>
#include <cstdint>

5
framegen/v3.1p_src/shaders/beta.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1p/shaders/beta.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <array>
#include <utility>
#include <cstddef>

5
framegen/v3.1p_src/shaders/delta.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1p/shaders/delta.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <array>
#include <optional>
#include <utility>

5
framegen/v3.1p_src/shaders/gamma.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1p/shaders/gamma.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <array>
#include <optional>
#include <utility>

5
framegen/v3.1p_src/shaders/generate.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1p/shaders/generate.hpp"
#include "common/utils.hpp"
#include "core/commandbuffer.hpp"
#include "core/image.hpp"
#include <vulkan/vulkan_core.h>
#include <vector>
#include <utility>
#include <cstddef>

5
framegen/v3.1p_src/shaders/mipmaps.cpp
View file

@ -1,10 +1,11 @@
#include <volk.h>
#include <vulkan/vulkan_core.h>
#include "v3_1p/shaders/mipmaps.hpp"
#include "common/utils.hpp"
#include "core/image.hpp"
#include "core/commandbuffer.hpp"
#include <vulkan/vulkan_core.h>
#include <utility>
#include <cstddef>
#include <cstdint>

1
thirdparty/volk vendored Submodule

@ -0,0 +1 @@
Subproject commit be3dbd49bf77052665e96b6c7484af855e7e5f67