NovaMods · cwfitzgerald · Mar 19, 2019 · Feb 27, 2019 · Feb 27, 2019 · Feb 27, 2019
diff --git a/.gitmodules b/.gitmodules
@@ -1,39 +1,3 @@
-[submodule "3rdparty/googletest"]
-	path = 3rdparty/googletest
-	url = https://github.com/google/googletest.git
-[submodule "3rdparty/glm"]
-	path = 3rdparty/glm
-	url = https://github.com/g-truc/glm.git
-[submodule "3rdparty/profiler"]
-	path = 3rdparty/profiler
-	url = https://github.com/NovaMods/profiler.git
-[submodule "3rdparty/json"]
-	path = 3rdparty/json
-	url = https://github.com/nlohmann/json.git
-[submodule "3rdparty/VulkanMemoryAllocator"]
-	path = 3rdparty/VulkanMemoryAllocator
-	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
-[submodule "3rdparty/SPIRV-Headers"]
-	path = 3rdparty/SPIRV-Headers
-	url = https://github.com/KhronosGroup/SPIRV-Headers.git
-[submodule "3rdparty/SPIRV-Tools"]
-	path = 3rdparty/SPIRV-Tools
-	url = https://github.com/KhronosGroup/SPIRV-Tools.git
-[submodule "3rdparty/SPIRV-Cross"]
-	path = 3rdparty/SPIRV-Cross
-	url = https://github.com/KhronosGroup/SPIRV-Cross.git
-[submodule "3rdparty/glslang"]
-	path = 3rdparty/glslang
-	url = https://github.com/KhronosGroup/glslang.git
-[submodule "3rdparty/miniz"]
-	path = 3rdparty/miniz
-	url = https://github.com/richgel999/miniz.git
-[submodule "3rdparty/minitrace"]
-	path = 3rdparty/minitrace
-	url = https://github.com/hrydgard/minitrace.git
 [submodule "3rdparty/run-clang-tidy"]
 	path = 3rdparty/run-clang-tidy
 	url = https://github.com/cwfitzgerald/run-clang-tidy.git
-[submodule "3rdparty/fmtlib"]
-	path = 3rdparty/fmtlib
-	url = https://github.com/fmtlib/fmt.git
diff --git a/3rdparty/3rdparty.cmake b/3rdparty/3rdparty.cmake
@@ -23,115 +23,28 @@ else()
     set(VULKAN_INCLUDE "")
 endif()
 
-#########################
-# Header only libraries #
-#########################
-
-include_target(glm::glm "${CMAKE_CURRENT_LIST_DIR}/glm")
-set_target_properties(glm::glm PROPERTIES INTERFACE_COMPILE_DEFINITIONS "GLM_ENABLE_EXPERIMENTAL")
-
-include_target(nlohmann::json "${CMAKE_CURRENT_LIST_DIR}/json/single_include")
-include_target(spirv::headers "${CMAKE_CURRENT_LIST_DIR}/SPIRV-Headers")
-include_target(vma::vma "${3RD_PARTY_DIR}/VulkanMemoryAllocator/src")
 include_target(vulkan::sdk "${VULKAN_INCLUDE}")
 
+find_package(glm CONFIG REQUIRED)
+find_package(nlohmann_json CONFIG REQUIRED)
+find_package(unofficial-vulkan-memory-allocator CONFIG REQUIRED)
+find_package(minitrace CONFIG REQUIRED)
+find_package(fmt CONFIG REQUIRED)
+find_package(miniz CONFIG REQUIRED)
+find_package(glslang CONFIG REQUIRED)
+find_package(spirv_cross_core CONFIG REQUIRED)
+find_package(spirv_cross_glsl CONFIG REQUIRED)
+find_package(spirv_cross_cpp CONFIG REQUIRED)
+find_package(spirv_cross_hlsl CONFIG REQUIRED)
+find_package(spirv_cross_msl CONFIG REQUIRED)
+find_package(spirv_cross_reflect CONFIG REQUIRED)
+find_package(spirv_cross_util CONFIG REQUIRED)
+find_package(SPIRV-Tools CONFIG REQUIRED)
+
 #####################
-# Setup google test #
+# Test dependencies #
 #####################
 if(NOVA_TEST)
-	set(INSTALL_GTEST OFF)
-	set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib even when Google Test is built as static lib." FORCE)
-	set(BUILD_GMOCK OFF CACHE BOOL "Build GMOCK shared library" FORCE)
-	add_subdirectory(3rdparty/googletest)
-	include(GoogleTest)
-endif()
-
-#######################
-# Submodule libraries #
-#######################
-
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/fmtlib)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/glslang)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/profiler)
-
-set(SPIRV-Headers_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/SPIRV-Headers)
-set(SPIRV_SKIP_TESTS ON CACHE BOOL "Disable SPIRV-Tools tests" FORCE)
-set(SPIRV_WERROR OFF CACHE BOOL "Enable error on warning SPIRV-Tools" FORCE)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/SPIRV-Tools)
-
-set(ENABLE_EXPORTS ON CACHE BOOL "Enable linking SPIRV_Cross" FORCE)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/SPIRV-Cross)
-
-target_includes_system(fmt)
-target_includes_system(glslang)
-if(NOVA_TEST)
-	target_includes_system(gtest)
-	target_includes_system(gtest_main)
+	find_package(GTest MODULE REQUIRED)
 endif()
-target_includes_system(nova-profiler)
-target_includes_system(SPIRV)
-target_includes_system(spirv-cross-core)
-target_includes_system(spirv-cross-glsl)
-target_includes_system(spirv-cross-hlsl)
-target_includes_system(spirv-cross-reflect)
-target_includes_system(spirv-cross-util)
-
-############################
-# Manually built libraries #
-############################
-
-include(miniz)
-include(minitrace)
-include(glslang)
-
-#####################################
-# Hide unnecessary targets from all #
-#####################################
-
-set_property(TARGET glslang PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET glslang-default-resource-limits PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET OGLCompiler PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET OSDependent PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET SPIRV PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET SPVRemapper PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET HLSL PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET glslangValidator PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-remap PROPERTY EXCLUDE_FROM_ALL True)
-
-set_property(TARGET spirv-tools-build-version PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-debuginfo PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-header-DebugInfo PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-spv-amd-gcn-shader PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-spv-amd-shader-ballot PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-spv-amd-shader-explicit-vertex-parameter PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-spv-amd-shader-trinary-minmax PROPERTY EXCLUDE_FROM_ALL True)
-
-set_property(TARGET spirv-tools-cpp-example PROPERTY EXCLUDE_FROM_ALL True)
-
-set_property(TARGET spirv-as PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cfg PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-dis PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-link PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-opt PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-reduce PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-stats PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-val PROPERTY EXCLUDE_FROM_ALL True)
-
-set_property(TARGET SPIRV-Tools PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET SPIRV-Tools-link PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET SPIRV-Tools-opt PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET SPIRV-Tools-reduce PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET SPIRV-Tools-shared PROPERTY EXCLUDE_FROM_ALL True)
-
-set_property(TARGET spirv-tools-vimsyntax PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-pkg-config PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-tools-shared-pkg-config PROPERTY EXCLUDE_FROM_ALL True)
 
-set_property(TARGET spirv-cross PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cross-core PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cross-cpp PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cross-glsl PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cross-hlsl PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cross-msl PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cross-reflect PROPERTY EXCLUDE_FROM_ALL True)
-set_property(TARGET spirv-cross-util PROPERTY EXCLUDE_FROM_ALL True)
diff --git a/3rdparty/SPIRV-Cross b/3rdparty/SPIRV-Cross
diff --git a/3rdparty/SPIRV-Headers b/3rdparty/SPIRV-Headers
diff --git a/3rdparty/SPIRV-Tools b/3rdparty/SPIRV-Tools
diff --git a/3rdparty/VulkanMemoryAllocator b/3rdparty/VulkanMemoryAllocator
diff --git a/3rdparty/fmtlib b/3rdparty/fmtlib
diff --git a/3rdparty/glm b/3rdparty/glm
diff --git a/3rdparty/glslang b/3rdparty/glslang
diff --git a/3rdparty/glslang.cmake b/3rdparty/glslang.cmake
diff --git a/3rdparty/googletest b/3rdparty/googletest
diff --git a/3rdparty/json b/3rdparty/json
diff --git a/3rdparty/minitrace b/3rdparty/minitrace
diff --git a/3rdparty/miniz b/3rdparty/miniz
diff --git a/3rdparty/miniz.cmake b/3rdparty/miniz.cmake
diff --git a/3rdparty/profiler b/3rdparty/profiler
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,7 @@ project(nova-renderer)
 ################################################################
 if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     set(NOVA_IN_SUBMODULE False)
+
 else()
     set(NOVA_IN_SUBMODULE True)
 endif()
@@ -255,23 +256,25 @@ add_coverage(nova-renderer)
 #########################
 set(COMMON_LINK_LIBS ${CMAKE_DL_LIBS}
                      fmt::fmt
-                     glm::glm
-                     glsl-standalone
-                     glslang
-                     minitrace
-                     miniz
-                     nlohmann::json
-                     nova-profiler
-                     SPIRV
+                     glm
+                     glslang::glslang
+                     glslang::OGLCompiler 
+                     glslang::OSDependent
+                     glslang::SPIRV
+                     minitrace::minitrace
+                     miniz::miniz
+                     nlohmann_json
+                     nlohmann_json::nlohmann_json
+                     spirv-tools::SPIRV-Tools
                      spirv-cross-core
+                     spirv-cross-cpp
                      spirv-cross-glsl
-                     spirv-cross-hlsl
                      spirv-cross-reflect
+                     spirv-cross-msl
                      spirv-cross-util
-                     spirv::headers
-                     vma::vma
-                     vulkan::sdk
-                     ${Vulkan_LIBRARIES})
+                     unofficial::vulkan-memory-allocator::vulkan-memory-allocator
+                     Vulkan::Vulkan
+                     vulkan::sdk)
 
 ##############################
 # Find C++ filesystem header #
@@ -299,7 +302,7 @@ if(WIN32)
     add_compile_options_if_supported(/Zc:twoPhase- /permissive)
 
     set_target_properties(nova-renderer PROPERTIES PREFIX "")
-    set(COMMON_LINK_LIBS ${COMMON_LINK_LIBS} d3d12 dxgi d3dcompiler)
+    set(COMMON_LINK_LIBS ${COMMON_LINK_LIBS} d3d12 dxgi d3dcompiler glslang::HLSL spirv-cross-hlsl)
     target_include_directories(nova-renderer PRIVATE ${WinSDK_DIRS})
     target_compile_definitions(nova-renderer PUBLIC _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING NOMINMAX)
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -22,12 +22,16 @@ install:
   - cmd: git submodule update --init --recursive
   - cmd: curl --silent --show-error --output VulkanSDK.exe https://cwfitz.com/s/19028-082433-VulkanSDK-1.1.97.0-Installer.exe
   - cmd: .\VulkanSDK.exe /S
+  - cmd: cd C:\Tools\vcpkg
+  - cmd: git pull
+  - cmd: cd %APPVEYOR_BUILD_FOLDER%
+  - ps: .\setup-windows.ps1
 
 before_build:
   - cmd: cd C:\projects\nova-renderer
   - cmd: md build
   - cmd: cd build
-  - cmd: cmake .. -G "Visual Studio 15 2017 Win64" -DNOVA_TEST=On -DNOVA_TREAT_WARNINGS_AS_ERRORS=On -Thost=x64
+  - cmd: cmake .. -G "Visual Studio 15 2017 Win64" -DNOVA_TEST=On -DNOVA_TREAT_WARNINGS_AS_ERRORS=On -Thost=x64 -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
 
 build:
   project: C:\projects\nova-renderer\build\nova-renderer.sln
@@ -38,6 +42,10 @@ test_script:
 - cmd: dir C:\projects\nova-renderer\build\%CONFIGURATION%\
 - cmd: C:\projects\nova-renderer\build\%CONFIGURATION%\nova-test-unit.exe
 
+cache: 
+  - c:\tools\vcpkg\packages\ -> appveyor.yml
+  - c:\tools\vcpkg\installed\ -> setup-windows.ps1
+
 on_success:
   - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
   - ps: ./send.ps1 success $env:WEBHOOK_URL

diff --git a/cmake/ClangFormat.cmake b/cmake/ClangFormat.cmake
@@ -31,9 +31,11 @@ message(STATUS "Found clang-format at ${CLANG_FORMAT_PROGRAM}")
 
 if(NOT TARGET format)
     add_custom_target(format VERBATIM)
+    set_target_properties(format PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True)
 endif()
 if(NOT TARGET reformat)
     add_custom_target(reformat VERBATIM)
+    set_target_properties(reformat PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True)
 endif()
 
 file(GLOB_RECURSE CLANG_FORMAT_PATHS CONFIGURE_DEPENDS "*.clang-format")
@@ -77,6 +79,8 @@ function(format TARGET)
         COMMAND "${CMAKE_COMMAND}" -E remove ${TOUCH_PATHS}
         COMMENT "Clearing format dependencies"
     )
+    set_target_properties(${TARGET}-format PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True FOLDER CMakePredefinedTargets/format)
+    set_target_properties(${TARGET}-reformat PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True FOLDER CMakePredefinedTargets/reformat)
 
     add_dependencies(format ${TARGET}-format)
     add_dependencies(reformat ${TARGET}-reformat)

diff --git a/jenkins.sh b/jenkins.sh
@@ -13,6 +13,7 @@ cd build-clang
 cmake ..\
     -DNOVA_TEST=ON\
     -DCMAKE_BUILD_TYPE=Debug\
+    -DCMAKE_TOOLCHAIN_FILE=${VCPKG_CMAKE}\
     -DCMAKE_EXPORT_COMPILE_COMMANDS=On\
     -DNOVA_TREAT_WARNINGS_AS_ERRORS=On\
     -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8\
@@ -32,6 +33,7 @@ cd build-gcc
 cmake ..\
     -DNOVA_TEST=On\
     -DCMAKE_BUILD_TYPE=Debug\
+    -DCMAKE_TOOLCHAIN_FILE=${VCPKG_CMAKE}\
     -DNOVA_TREAT_WARNINGS_AS_ERRORS=On\
     -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7\
     -DCMAKE_{C,CXX}_COMPILER_LAUNCHER=ccache\

diff --git a/readme.md b/readme.md
@@ -17,6 +17,25 @@ The Nova Renderer is currently early in development, so early that I don't think
 
 If you want to see what we have planned, or what has already been done, check out [the GitHub projects page](https://github.com/NovaMods/nova-renderer/projects).
 
+## Developer setup
+
+Nova uses [vcpkg](https://github.com/Microsoft/vcpkg) for dependency management. You need to install it on your system PATH. Once `vcpkg` is on your path, run the appropriate setup script for your platform - run `setup-windows.ps1` from Powershell on Windows, run `setup-linux.sh` from Bash on Linux. This will install almost all of Nova's dependencies
+
+Install the LunarG Vulkan SDK. Use the latest SDK for Vulkan 1.1
+
+Generate your compiler's build files from the CMake project. We recommend creating your build files in a `build` directory in the root of your local Nova Renderer repository. Be sure to pass CMake the `vcpkg` toolchain file, or your CMake will be very sad. An example:
+
+```powershell
+cd $PATH_TO_NOVA
+mkdir build
+cd build
+cmake -DCMAKE_TOOLCHAIN_FILE=C:/Users/DethRaid/Documents/vcpkg/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 15 2017 Win64" -Thost=x64 ..
+```
+
+This will generate project files for Visual Studio 2017 to compile for a 64-bit machine, and it will use the `vcpkg` toolchain file in my local `vcpkg` repo
+
+That's it!
+
 ## End Goal
 
 Everything from here on out describes what the Nova Renderer will look like during version 1.0. This doesn't necessarily reflect the current status of the project. Check [the GitHub projects page](https://github.com/NovaMods/nova-renderer/projects) to see the current status of the Nova Renderer.

diff --git a/setup-linux.sh b/setup-linux.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+vcpkg update
+vcpkg upgrade --no-dry-run
+vcpkg install --recurse miniz:x64-linux fmt:x64-linux glm:x64-linux glslang:x64-linux gtest:x64-linux nlohmann-json:x64-linux spirv-cross:x64-linux spirv-tools:x64-linux vulkan-memory-allocator:x64-linux vulkan:x64-linux spirv-tools:x64-linux minitrace:x64-linux
diff --git a/setup-windows.ps1 b/setup-windows.ps1
@@ -0,0 +1,3 @@
+vcpkg update
+vcpkg upgrade --no-dry-run
+vcpkg install --recurse miniz:x64-windows fmt:x64-windows glm:x64-windows glslang:x64-windows gtest:x64-windows nlohmann-json:x64-windows spirv-cross:x64-windows spirv-tools:x64-windows vulkan-memory-allocator:x64-windows vulkan:x64-windows spirv-tools:x64-windows minitrace:x64-windows
diff --git a/src/loading/shaderpack/render_graph_builder.cpp b/src/loading/shaderpack/render_graph_builder.cpp
@@ -4,9 +4,9 @@
  */
 
 #include "render_graph_builder.hpp"
+#include <minitrace/minitrace.h>
 #include <unordered_set>
 #include "../../util/logger.hpp"
-#include "nova/profiler.h"
 
 namespace nova::renderer {
     /*!
@@ -77,8 +77,8 @@ namespace nova::renderer {
     }
 
     std::vector<std::string> order_passes(const std::unordered_map<std::string, render_pass_data>& passes) {
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
-        NOVA_PROFILER_SCOPE;
+        MTR_SCOPE("Renderpass", "order_passes");
+
         NOVA_LOG(DEBUG) << "Executing Pass Scheduler";
         std::vector<std::string> ordered_passes;
 

diff --git a/src/loading/shaderpack/shaderpack_data.cpp b/src/loading/shaderpack/shaderpack_data.cpp
@@ -5,7 +5,6 @@
 
 #include "../../util/vma_usage.hpp"
 
-#include <Common.h>
 #include "../json_utils.hpp"
 #include "shaderpack_data.hpp"