diff --git a/.gitmodules b/.gitmodules index 288b2cf..86231e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "external/boost"] - path = external/boost - url = https://github.com/boostorg/boost [submodule "external/glm"] path = external/glm url = https://github.com/g-truc/glm.git @@ -23,4 +20,4 @@ url = https://github.com/nothings/stb [submodule "external/slang"] path = external/slang - url = https://github.com/shader-slang/slang.git + url = https://github.com/shader-slang/slang.git \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index e6c62ed..3f64b03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,16 +22,6 @@ set(NSAM_ROOT ${EXTERNAL_ROOT}/aftermath) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/) -set(Boost_USE_STATIC_LIBS OFF) -if(WIN32) - set(Boost_LIB_PREFIX lib) -endif() - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}) -#Workaround for vs, because it places artifacts into an additional subfolder -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin/Release) - if (USE_SUPERBUILD) project (SUPERBUILD NONE) # execute the superbuild (this script will be invoked again without the @@ -42,6 +32,12 @@ else() project (Seele) endif() +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}) +#Workaround for vs, because it places artifacts into an additional subfolder +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin/Release) + + find_package(Vulkan REQUIRED) find_package(Boost REQUIRED COMPONENTS serialization) find_package(Threads REQUIRED) @@ -122,7 +118,7 @@ if(WIN32) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_BINARIES} $ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_GLSLANG} $ #COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GLFW_BINARY} $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ASSIMP_BINARY} $ + #COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ASSIMP_BINARY} $ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NSAM_BINARIES} $) else() add_custom_target(copy-binaries ALL COMMAND "") diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake index a426ccc..f508804 100644 --- a/cmake/SuperBuild.cmake +++ b/cmake/SuperBuild.cmake @@ -27,7 +27,7 @@ endif() ExternalProject_Add(boost SOURCE_DIR ${BOOST_ROOT} CONFIGURE_COMMAND ./bootstrap.${BOOTSTRAP_EXTENSION} --with-libraries=serialization,test - BUILD_COMMAND ./b2 -d0 + BUILD_COMMAND ./b2 -d0 -link=shared BUILD_IN_SOURCE 1 INSTALL_COMMAND "") diff --git a/external/boost b/external/boost deleted file mode 160000 index 4d8de5a..0000000 --- a/external/boost +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4d8de5a695430fec0856bf667b6c73855428d83b diff --git a/src/Engine/Graphics/RenderPass/RenderGraph.h b/src/Engine/Graphics/RenderPass/RenderGraph.h index f72e182..2d0c60b 100644 --- a/src/Engine/Graphics/RenderPass/RenderGraph.h +++ b/src/Engine/Graphics/RenderPass/RenderGraph.h @@ -1,7 +1,6 @@ #pragma once #include "MinimalEngine.h" #include "Graphics/GraphicsResources.h" -#include "RenderPass.h" namespace Seele { diff --git a/src/Engine/Graphics/RenderPass/RenderPass.h b/src/Engine/Graphics/RenderPass/RenderPass.h index e562629..4d17db3 100644 --- a/src/Engine/Graphics/RenderPass/RenderPass.h +++ b/src/Engine/Graphics/RenderPass/RenderPass.h @@ -1,13 +1,13 @@ #pragma once #include "MinimalEngine.h" #include "Math/Math.h" +#include "RenderGraph.h" namespace Seele { DECLARE_NAME_REF(Gfx, Viewport) DECLARE_NAME_REF(Gfx, Graphics) DECLARE_NAME_REF(Gfx, RenderPass) -DECLARE_REF(RenderGraphResources) template class RenderPass { diff --git a/src/Engine/Graphics/VertexShaderInput.cpp b/src/Engine/Graphics/VertexShaderInput.cpp index 0bd1584..61550a8 100644 --- a/src/Engine/Graphics/VertexShaderInput.cpp +++ b/src/Engine/Graphics/VertexShaderInput.cpp @@ -59,6 +59,8 @@ VertexShaderInput::~VertexShaderInput() { } +void VertexShaderInput::init(Gfx::PGraphics) {} + void VertexShaderInput::getStreams(VertexInputStreamArray& outVertexStreams) const { for(uint32 i = 0; i < streams.size(); ++i) diff --git a/src/Engine/Graphics/VertexShaderInput.h b/src/Engine/Graphics/VertexShaderInput.h index 91c8821..1fd725a 100644 --- a/src/Engine/Graphics/VertexShaderInput.h +++ b/src/Engine/Graphics/VertexShaderInput.h @@ -117,7 +117,7 @@ class VertexShaderInput public: VertexShaderInput(std::string name); virtual ~VertexShaderInput(); - virtual void init(Gfx::PGraphics) {} + virtual void init(Gfx::PGraphics); void getStreams(VertexInputStreamArray& outVertexStreams) const; void getPositionOnlyStream(VertexInputStreamArray& outVertexStreams) const; virtual bool supportsTesselation() { return false; } diff --git a/src/Engine/ThreadPool.cpp b/src/Engine/ThreadPool.cpp index 61b4ab7..9a77084 100644 --- a/src/Engine/ThreadPool.cpp +++ b/src/Engine/ThreadPool.cpp @@ -47,7 +47,6 @@ ThreadPool::~ThreadPool() void ThreadPool::addJob(Job&& job) { std::unique_lock lock(jobQueueLock); - //std::cout << "Adding job " << job << std::endl; jobQueue.add(std::move(job)); jobQueueCV.notify_one(); } diff --git a/src/Engine/ThreadPool.h b/src/Engine/ThreadPool.h index 7898a7d..ccac955 100644 --- a/src/Engine/ThreadPool.h +++ b/src/Engine/ThreadPool.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "MinimalEngine.h" #include "Containers/List.h" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c4dd8a6..f4327b9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,6 +13,8 @@ target_precompile_headers(Seele_unit_tests + +