From 4fd44b075faa67f026eb13a9ed0295b4624f16b0 Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Mon, 16 Mar 2026 16:54:14 +0100 Subject: [PATCH] reintroducing vulkan --- CMakeLists.txt | 12 ++++-------- external/vcpkg | 2 +- src/Editor/main.cpp | 1 + vcpkg.json | 6 ++---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dcaefd..d940d74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,9 +43,7 @@ find_package(lunasvg CONFIG REQUIRED) find_package(slang CONFIG REQUIRED) find_package(metis CONFIG REQUIRED) find_package(meshoptimizer CONFIG REQUIRED) -if(NOT APPLE) - find_package(VulkanMemoryAllocator CONFIG REQUIRED) -endif() +find_package(VulkanMemoryAllocator CONFIG REQUIRED) if(UNIX) find_package(Threads REQUIRED) @@ -58,11 +56,9 @@ endif() add_library(Engine SHARED "") target_include_directories(Engine PRIVATE src/Engine) -if(NOT APPLE) - target_link_libraries(Engine PUBLIC Vulkan::Vulkan) - target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator) - target_link_libraries(Engine PUBLIC slang::slang-glslang) -endif() +target_link_libraries(Engine PUBLIC Vulkan::Vulkan) +target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator) +target_link_libraries(Engine PUBLIC slang::slang-glslang) target_link_libraries(Engine PUBLIC EnTT::EnTT) target_link_libraries(Engine PUBLIC glfw) target_link_libraries(Engine PUBLIC glm::glm) diff --git a/external/vcpkg b/external/vcpkg index f9a99aa..365f644 160000 --- a/external/vcpkg +++ b/external/vcpkg @@ -1 +1 @@ -Subproject commit f9a99aa79c1309001e36572fa42d7d8edebfc451 +Subproject commit 365f6444ab40ee87c73c947b475b3a267b3cb77c diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp index d39ca1b..3f88846 100644 --- a/src/Editor/main.cpp +++ b/src/Editor/main.cpp @@ -8,6 +8,7 @@ #include "Asset/TextureLoader.h" #include "Graphics/Initializer.h" #include "Material/Material.h" +#include "Graphics/Vulkan/Graphics.h" #include "Graphics/StaticMeshVertexData.h" #include "Window/PlayView.h" #include "Window/WindowManager.h" diff --git a/vcpkg.json b/vcpkg.json index c9d8af0..2ed3b47 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,12 +1,10 @@ { "dependencies": [ { - "name": "vulkan", - "platform": "!osx" + "name": "vulkan" }, { - "name": "vulkan-memory-allocator", - "platform": "!osx" + "name": "vulkan-memory-allocator" }, "assimp", "stb",