diff --git a/config/lib/vma/vma.cpp b/config/lib/vma/vma.cpp index 307c27f096bd1bae2b1deb2ca5994f132adc92cc..1fc40eb10123b1c89f6c348f4c2e898df21b43b0 100644 --- a/config/lib/vma/vma.cpp +++ b/config/lib/vma/vma.cpp @@ -1,7 +1,9 @@ #ifndef NDEBUG +#ifndef _DEBUG #define _DEBUG #endif +#endif #ifndef _MSVC_LANG #ifdef __MINGW32__ diff --git a/include/vkcv/PushConstants.hpp b/include/vkcv/PushConstants.hpp index 7ba083f698bffdaf17179c0d25891aba4ef881a2..4c577acbe09cd6b19d82213526bc4b7d498a6ede 100644 --- a/include/vkcv/PushConstants.hpp +++ b/include/vkcv/PushConstants.hpp @@ -137,7 +137,7 @@ namespace vkcv { template <typename T> PushConstants pushConstants(const T &value) { auto pc = pushConstants<T>(); - pc.template appendDrawcall(value); + pc.template appendDrawcall<T>(value); return pc; } @@ -146,7 +146,7 @@ namespace vkcv { auto pc = pushConstants<T>(); for (const T &value : values) { - if (!(pc.template appendDrawcall(value))) { + if (!(pc.template appendDrawcall<T>(value))) { break; } } diff --git a/modules/geometry/src/vkcv/geometry/Cylinder.cpp b/modules/geometry/src/vkcv/geometry/Cylinder.cpp index 67b62f694714e86877879f25e59d086627e95731..0583c4c134922f16ed00d8ff36f81c027051bb90 100644 --- a/modules/geometry/src/vkcv/geometry/Cylinder.cpp +++ b/modules/geometry/src/vkcv/geometry/Cylinder.cpp @@ -1,6 +1,8 @@ #include "vkcv/geometry/Cylinder.hpp" +#include <numbers> + namespace vkcv::geometry { Cylinder::Cylinder(const glm::vec3 &position, float height, float radius) diff --git a/modules/upscaling/lib/FidelityFX-FSR2 b/modules/upscaling/lib/FidelityFX-FSR2 index 0ce4ff5c5a0210273be7e3085bb4b15d0590431c..59950a85247baa4e099537324912a1f0e3a7b5d5 160000 --- a/modules/upscaling/lib/FidelityFX-FSR2 +++ b/modules/upscaling/lib/FidelityFX-FSR2 @@ -1 +1 @@ -Subproject commit 0ce4ff5c5a0210273be7e3085bb4b15d0590431c +Subproject commit 59950a85247baa4e099537324912a1f0e3a7b5d5 diff --git a/modules/upscaling/src/vkcv/upscaling/FSR2Upscaling.cpp b/modules/upscaling/src/vkcv/upscaling/FSR2Upscaling.cpp index 0478596daef709ef8b5ae583221d402d36d76dba..5c85b566be530c989dc8ad4dce967275bff64802 100644 --- a/modules/upscaling/src/vkcv/upscaling/FSR2Upscaling.cpp +++ b/modules/upscaling/src/vkcv/upscaling/FSR2Upscaling.cpp @@ -3,10 +3,16 @@ #include <cmath> +#ifndef _MSVC_LANG #define FFX_GCC +#endif + #include <ffx_fsr2.h> #include <ffx_fsr2_vk.h> + +#ifdef FFX_GCC #undef FFX_GCC +#endif namespace vkcv::upscaling {