From 1576edcf1a4e0e9e45fe729b6145a506e8d9060c Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Sat, 12 Jul 2025 19:51:55 +0200 Subject: [PATCH] avoid symbol clashing --- lsfg-vk-v3.1/include/context.hpp | 4 +++- lsfg-vk-v3.1/include/shaders/alpha.hpp | 4 +++- lsfg-vk-v3.1/include/shaders/beta.hpp | 4 +++- lsfg-vk-v3.1/include/shaders/delta.hpp | 4 +++- lsfg-vk-v3.1/include/shaders/gamma.hpp | 4 +++- lsfg-vk-v3.1/include/shaders/generate.hpp | 4 +++- lsfg-vk-v3.1/include/shaders/mipmaps.hpp | 4 +++- lsfg-vk-v3.1/src/context.cpp | 2 +- lsfg-vk-v3.1/src/shaders/alpha.cpp | 2 +- lsfg-vk-v3.1/src/shaders/beta.cpp | 2 +- lsfg-vk-v3.1/src/shaders/delta.cpp | 2 +- lsfg-vk-v3.1/src/shaders/gamma.cpp | 2 +- lsfg-vk-v3.1/src/shaders/generate.cpp | 2 +- lsfg-vk-v3.1/src/shaders/mipmaps.cpp | 2 +- lsfg-vk-v3.1p/include/context.hpp | 4 +++- lsfg-vk-v3.1p/include/shaders/alpha.hpp | 4 +++- lsfg-vk-v3.1p/include/shaders/beta.hpp | 4 +++- lsfg-vk-v3.1p/include/shaders/delta.hpp | 4 +++- lsfg-vk-v3.1p/include/shaders/gamma.hpp | 4 +++- lsfg-vk-v3.1p/include/shaders/generate.hpp | 4 +++- lsfg-vk-v3.1p/include/shaders/mipmaps.hpp | 4 +++- lsfg-vk-v3.1p/src/context.cpp | 1 + lsfg-vk-v3.1p/src/shaders/alpha.cpp | 2 +- lsfg-vk-v3.1p/src/shaders/beta.cpp | 2 +- lsfg-vk-v3.1p/src/shaders/delta.cpp | 2 +- lsfg-vk-v3.1p/src/shaders/gamma.cpp | 2 +- lsfg-vk-v3.1p/src/shaders/generate.cpp | 2 +- lsfg-vk-v3.1p/src/shaders/mipmaps.cpp | 2 +- src/context.cpp | 1 + 29 files changed, 57 insertions(+), 27 deletions(-) diff --git a/lsfg-vk-v3.1/include/context.hpp b/lsfg-vk-v3.1/include/context.hpp index 3819f02..16e3ffa 100644 --- a/lsfg-vk-v3.1/include/context.hpp +++ b/lsfg-vk-v3.1/include/context.hpp @@ -18,7 +18,9 @@ #include #include -namespace LSFG { +namespace LSFG_3_1 { + + using namespace LSFG; class Context { public: diff --git a/lsfg-vk-v3.1/include/shaders/alpha.hpp b/lsfg-vk-v3.1/include/shaders/alpha.hpp index c837264..11e516b 100644 --- a/lsfg-vk-v3.1/include/shaders/alpha.hpp +++ b/lsfg-vk-v3.1/include/shaders/alpha.hpp @@ -11,7 +11,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1::Shaders { + + using namespace LSFG; /// /// Alpha shader. diff --git a/lsfg-vk-v3.1/include/shaders/beta.hpp b/lsfg-vk-v3.1/include/shaders/beta.hpp index 6921673..58fd974 100644 --- a/lsfg-vk-v3.1/include/shaders/beta.hpp +++ b/lsfg-vk-v3.1/include/shaders/beta.hpp @@ -12,7 +12,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1::Shaders { + + using namespace LSFG; /// /// Beta shader. diff --git a/lsfg-vk-v3.1/include/shaders/delta.hpp b/lsfg-vk-v3.1/include/shaders/delta.hpp index 52a64d8..e671223 100644 --- a/lsfg-vk-v3.1/include/shaders/delta.hpp +++ b/lsfg-vk-v3.1/include/shaders/delta.hpp @@ -14,7 +14,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1::Shaders { + + using namespace LSFG; /// /// Delta shader. diff --git a/lsfg-vk-v3.1/include/shaders/gamma.hpp b/lsfg-vk-v3.1/include/shaders/gamma.hpp index 6298bb3..f3b4f73 100644 --- a/lsfg-vk-v3.1/include/shaders/gamma.hpp +++ b/lsfg-vk-v3.1/include/shaders/gamma.hpp @@ -14,7 +14,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1::Shaders { + + using namespace LSFG; /// /// Gamma shader. diff --git a/lsfg-vk-v3.1/include/shaders/generate.hpp b/lsfg-vk-v3.1/include/shaders/generate.hpp index cf8d5f4..5d63ef2 100644 --- a/lsfg-vk-v3.1/include/shaders/generate.hpp +++ b/lsfg-vk-v3.1/include/shaders/generate.hpp @@ -15,7 +15,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1::Shaders { + + using namespace LSFG; /// /// Generate shader. diff --git a/lsfg-vk-v3.1/include/shaders/mipmaps.hpp b/lsfg-vk-v3.1/include/shaders/mipmaps.hpp index cdffed7..e3595b4 100644 --- a/lsfg-vk-v3.1/include/shaders/mipmaps.hpp +++ b/lsfg-vk-v3.1/include/shaders/mipmaps.hpp @@ -12,7 +12,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1::Shaders { + + using namespace LSFG; /// /// Mipmaps shader. diff --git a/lsfg-vk-v3.1/src/context.cpp b/lsfg-vk-v3.1/src/context.cpp index 0e45687..362d337 100644 --- a/lsfg-vk-v3.1/src/context.cpp +++ b/lsfg-vk-v3.1/src/context.cpp @@ -10,7 +10,7 @@ #include #include -using namespace LSFG; +using namespace LSFG_3_1; Context::Context(Vulkan& vk, int in0, int in1, const std::vector& outN, diff --git a/lsfg-vk-v3.1/src/shaders/alpha.cpp b/lsfg-vk-v3.1/src/shaders/alpha.cpp index 79c555c..58b03ec 100644 --- a/lsfg-vk-v3.1/src/shaders/alpha.cpp +++ b/lsfg-vk-v3.1/src/shaders/alpha.cpp @@ -9,7 +9,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1::Shaders; Alpha::Alpha(Vulkan& vk, Core::Image inImg) : inImg(std::move(inImg)) { // create resources diff --git a/lsfg-vk-v3.1/src/shaders/beta.cpp b/lsfg-vk-v3.1/src/shaders/beta.cpp index 64b3fd3..96c49b5 100644 --- a/lsfg-vk-v3.1/src/shaders/beta.cpp +++ b/lsfg-vk-v3.1/src/shaders/beta.cpp @@ -10,7 +10,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1::Shaders; Beta::Beta(Vulkan& vk, std::array, 3> inImgs) : inImgs(std::move(inImgs)) { diff --git a/lsfg-vk-v3.1/src/shaders/delta.cpp b/lsfg-vk-v3.1/src/shaders/delta.cpp index 8c05f20..1183e51 100644 --- a/lsfg-vk-v3.1/src/shaders/delta.cpp +++ b/lsfg-vk-v3.1/src/shaders/delta.cpp @@ -11,7 +11,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1::Shaders; Delta::Delta(Vulkan& vk, std::array, 3> inImgs1, Core::Image inImg2, diff --git a/lsfg-vk-v3.1/src/shaders/gamma.cpp b/lsfg-vk-v3.1/src/shaders/gamma.cpp index e703d4e..baf0c0f 100644 --- a/lsfg-vk-v3.1/src/shaders/gamma.cpp +++ b/lsfg-vk-v3.1/src/shaders/gamma.cpp @@ -11,7 +11,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1::Shaders; Gamma::Gamma(Vulkan& vk, std::array, 3> inImgs1, Core::Image inImg2, diff --git a/lsfg-vk-v3.1/src/shaders/generate.cpp b/lsfg-vk-v3.1/src/shaders/generate.cpp index dde317c..6d2569b 100644 --- a/lsfg-vk-v3.1/src/shaders/generate.cpp +++ b/lsfg-vk-v3.1/src/shaders/generate.cpp @@ -10,7 +10,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1::Shaders; Generate::Generate(Vulkan& vk, Core::Image inImg1, Core::Image inImg2, diff --git a/lsfg-vk-v3.1/src/shaders/mipmaps.cpp b/lsfg-vk-v3.1/src/shaders/mipmaps.cpp index eab1e91..0bc5065 100644 --- a/lsfg-vk-v3.1/src/shaders/mipmaps.cpp +++ b/lsfg-vk-v3.1/src/shaders/mipmaps.cpp @@ -9,7 +9,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1::Shaders; Mipmaps::Mipmaps(Vulkan& vk, Core::Image inImg_0, Core::Image inImg_1) diff --git a/lsfg-vk-v3.1p/include/context.hpp b/lsfg-vk-v3.1p/include/context.hpp index 3819f02..ce965a0 100644 --- a/lsfg-vk-v3.1p/include/context.hpp +++ b/lsfg-vk-v3.1p/include/context.hpp @@ -18,7 +18,9 @@ #include #include -namespace LSFG { +namespace LSFG_3_1P { + + using namespace LSFG; class Context { public: diff --git a/lsfg-vk-v3.1p/include/shaders/alpha.hpp b/lsfg-vk-v3.1p/include/shaders/alpha.hpp index 5aad2dc..c816285 100644 --- a/lsfg-vk-v3.1p/include/shaders/alpha.hpp +++ b/lsfg-vk-v3.1p/include/shaders/alpha.hpp @@ -11,7 +11,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1P::Shaders { + + using namespace LSFG; /// /// Alpha shader. diff --git a/lsfg-vk-v3.1p/include/shaders/beta.hpp b/lsfg-vk-v3.1p/include/shaders/beta.hpp index 11f6ccc..549aa9e 100644 --- a/lsfg-vk-v3.1p/include/shaders/beta.hpp +++ b/lsfg-vk-v3.1p/include/shaders/beta.hpp @@ -12,7 +12,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1P::Shaders { + + using namespace LSFG; /// /// Beta shader. diff --git a/lsfg-vk-v3.1p/include/shaders/delta.hpp b/lsfg-vk-v3.1p/include/shaders/delta.hpp index 72d9262..fdbf3d1 100644 --- a/lsfg-vk-v3.1p/include/shaders/delta.hpp +++ b/lsfg-vk-v3.1p/include/shaders/delta.hpp @@ -14,7 +14,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1P::Shaders { + + using namespace LSFG; /// /// Delta shader. diff --git a/lsfg-vk-v3.1p/include/shaders/gamma.hpp b/lsfg-vk-v3.1p/include/shaders/gamma.hpp index fa8e8e4..b4e24ab 100644 --- a/lsfg-vk-v3.1p/include/shaders/gamma.hpp +++ b/lsfg-vk-v3.1p/include/shaders/gamma.hpp @@ -14,7 +14,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1P::Shaders { + + using namespace LSFG; /// /// Gamma shader. diff --git a/lsfg-vk-v3.1p/include/shaders/generate.hpp b/lsfg-vk-v3.1p/include/shaders/generate.hpp index cf8d5f4..42f1e7b 100644 --- a/lsfg-vk-v3.1p/include/shaders/generate.hpp +++ b/lsfg-vk-v3.1p/include/shaders/generate.hpp @@ -15,7 +15,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1P::Shaders { + + using namespace LSFG; /// /// Generate shader. diff --git a/lsfg-vk-v3.1p/include/shaders/mipmaps.hpp b/lsfg-vk-v3.1p/include/shaders/mipmaps.hpp index cdffed7..ce0dca1 100644 --- a/lsfg-vk-v3.1p/include/shaders/mipmaps.hpp +++ b/lsfg-vk-v3.1p/include/shaders/mipmaps.hpp @@ -12,7 +12,9 @@ #include #include -namespace LSFG::Shaders { +namespace LSFG_3_1P::Shaders { + + using namespace LSFG; /// /// Mipmaps shader. diff --git a/lsfg-vk-v3.1p/src/context.cpp b/lsfg-vk-v3.1p/src/context.cpp index 327c4a7..5a18353 100644 --- a/lsfg-vk-v3.1p/src/context.cpp +++ b/lsfg-vk-v3.1p/src/context.cpp @@ -11,6 +11,7 @@ #include using namespace LSFG; +using namespace LSFG_3_1P; Context::Context(Vulkan& vk, int in0, int in1, const std::vector& outN, diff --git a/lsfg-vk-v3.1p/src/shaders/alpha.cpp b/lsfg-vk-v3.1p/src/shaders/alpha.cpp index c8ae075..f572f4c 100644 --- a/lsfg-vk-v3.1p/src/shaders/alpha.cpp +++ b/lsfg-vk-v3.1p/src/shaders/alpha.cpp @@ -9,7 +9,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1P::Shaders; Alpha::Alpha(Vulkan& vk, Core::Image inImg) : inImg(std::move(inImg)) { // create resources diff --git a/lsfg-vk-v3.1p/src/shaders/beta.cpp b/lsfg-vk-v3.1p/src/shaders/beta.cpp index 27f554c..1a24825 100644 --- a/lsfg-vk-v3.1p/src/shaders/beta.cpp +++ b/lsfg-vk-v3.1p/src/shaders/beta.cpp @@ -10,7 +10,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1P::Shaders; Beta::Beta(Vulkan& vk, std::array, 3> inImgs) : inImgs(std::move(inImgs)) { diff --git a/lsfg-vk-v3.1p/src/shaders/delta.cpp b/lsfg-vk-v3.1p/src/shaders/delta.cpp index 2c77c00..c479945 100644 --- a/lsfg-vk-v3.1p/src/shaders/delta.cpp +++ b/lsfg-vk-v3.1p/src/shaders/delta.cpp @@ -11,7 +11,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1P::Shaders; Delta::Delta(Vulkan& vk, std::array, 3> inImgs1, Core::Image inImg2, diff --git a/lsfg-vk-v3.1p/src/shaders/gamma.cpp b/lsfg-vk-v3.1p/src/shaders/gamma.cpp index 325eb81..ccbe932 100644 --- a/lsfg-vk-v3.1p/src/shaders/gamma.cpp +++ b/lsfg-vk-v3.1p/src/shaders/gamma.cpp @@ -11,7 +11,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1P::Shaders; Gamma::Gamma(Vulkan& vk, std::array, 3> inImgs1, Core::Image inImg2, diff --git a/lsfg-vk-v3.1p/src/shaders/generate.cpp b/lsfg-vk-v3.1p/src/shaders/generate.cpp index dde317c..7772217 100644 --- a/lsfg-vk-v3.1p/src/shaders/generate.cpp +++ b/lsfg-vk-v3.1p/src/shaders/generate.cpp @@ -10,7 +10,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1P::Shaders; Generate::Generate(Vulkan& vk, Core::Image inImg1, Core::Image inImg2, diff --git a/lsfg-vk-v3.1p/src/shaders/mipmaps.cpp b/lsfg-vk-v3.1p/src/shaders/mipmaps.cpp index eab1e91..971055f 100644 --- a/lsfg-vk-v3.1p/src/shaders/mipmaps.cpp +++ b/lsfg-vk-v3.1p/src/shaders/mipmaps.cpp @@ -9,7 +9,7 @@ #include #include -using namespace LSFG::Shaders; +using namespace LSFG_3_1P::Shaders; Mipmaps::Mipmaps(Vulkan& vk, Core::Image inImg_0, Core::Image inImg_1) diff --git a/src/context.cpp b/src/context.cpp index e9f5ec8..712ef23 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -78,6 +78,7 @@ LsContext::LsContext(const Hooks::DeviceInfo& info, VkSwapchainKHR swapchain, i, out_n_fds.at(i)); } + this->isPerfMode = false; auto* lsfgInitialize = LSFG_3_1::initialize; auto* lsfgCreateContext = LSFG_3_1::createContext; auto* lsfgDeleteContext = LSFG_3_1::deleteContext;