avoid symbol clashing

lsfg-vk-v3.1/include/context.hpp

@@ -18,7 +18,9 @@
 #include <cstdint>
 #include <array>
 
-namespace LSFG {
+namespace LSFG_3_1 {
+
+    using namespace LSFG;
 
     class Context {
     public:

lsfg-vk-v3.1/include/shaders/alpha.hpp

@@ -11,7 +11,9 @@
 #include <array>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Alpha shader.

lsfg-vk-v3.1/include/shaders/beta.hpp

@@ -12,7 +12,9 @@
 #include <array>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Beta shader.

lsfg-vk-v3.1/include/shaders/delta.hpp

@@ -14,7 +14,9 @@
 #include <optional>
 #include <vector>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Delta shader.

lsfg-vk-v3.1/include/shaders/gamma.hpp

@@ -14,7 +14,9 @@
 #include <optional>
 #include <vector>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Gamma shader.

lsfg-vk-v3.1/include/shaders/generate.hpp

@@ -15,7 +15,9 @@
 #include <vector>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Generate shader.

lsfg-vk-v3.1/include/shaders/mipmaps.hpp

@@ -12,7 +12,9 @@
 #include <array>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Mipmaps shader.

lsfg-vk-v3.1/src/context.cpp

@@ -10,7 +10,7 @@
 #include <optional>
 #include <cstdint>
 
-using namespace LSFG;
+using namespace LSFG_3_1;
 
 Context::Context(Vulkan& vk,
         int in0, int in1, const std::vector<int>& outN,

lsfg-vk-v3.1/src/shaders/alpha.cpp

@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1::Shaders;
 
 Alpha::Alpha(Vulkan& vk, Core::Image inImg) : inImg(std::move(inImg)) {
     // create resources

lsfg-vk-v3.1/src/shaders/beta.cpp

@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1::Shaders;
 
 Beta::Beta(Vulkan& vk, std::array<std::array<Core::Image, 4>, 3> inImgs)
         : inImgs(std::move(inImgs)) {

lsfg-vk-v3.1/src/shaders/delta.cpp

@@ -11,7 +11,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1::Shaders;
 
 Delta::Delta(Vulkan& vk, std::array<std::array<Core::Image, 4>, 3> inImgs1,
         Core::Image inImg2,

lsfg-vk-v3.1/src/shaders/gamma.cpp

@@ -11,7 +11,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1::Shaders;
 
 Gamma::Gamma(Vulkan& vk, std::array<std::array<Core::Image, 4>, 3> inImgs1,
         Core::Image inImg2,

lsfg-vk-v3.1/src/shaders/generate.cpp

@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1::Shaders;
 
 Generate::Generate(Vulkan& vk,
     Core::Image inImg1, Core::Image inImg2,

lsfg-vk-v3.1/src/shaders/mipmaps.cpp

@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1::Shaders;
 
 Mipmaps::Mipmaps(Vulkan& vk,
         Core::Image inImg_0, Core::Image inImg_1)

lsfg-vk-v3.1p/include/context.hpp

@@ -18,7 +18,9 @@
 #include <cstdint>
 #include <array>
 
-namespace LSFG {
+namespace LSFG_3_1P {
+
+    using namespace LSFG;
 
     class Context {
     public:

lsfg-vk-v3.1p/include/shaders/alpha.hpp

@@ -11,7 +11,9 @@
 #include <array>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1P::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Alpha shader.

lsfg-vk-v3.1p/include/shaders/beta.hpp

@@ -12,7 +12,9 @@
 #include <array>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1P::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Beta shader.

lsfg-vk-v3.1p/include/shaders/delta.hpp

@@ -14,7 +14,9 @@
 #include <optional>
 #include <vector>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1P::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Delta shader.

lsfg-vk-v3.1p/include/shaders/gamma.hpp

@@ -14,7 +14,9 @@
 #include <optional>
 #include <vector>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1P::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Gamma shader.

lsfg-vk-v3.1p/include/shaders/generate.hpp

@@ -15,7 +15,9 @@
 #include <vector>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1P::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Generate shader.

lsfg-vk-v3.1p/include/shaders/mipmaps.hpp

@@ -12,7 +12,9 @@
 #include <array>
 #include <cstdint>
 
-namespace LSFG::Shaders {
+namespace LSFG_3_1P::Shaders {
+
+    using namespace LSFG;
 
     ///
     /// Mipmaps shader.

lsfg-vk-v3.1p/src/context.cpp

@@ -11,6 +11,7 @@
 #include <cstdint>
 
 using namespace LSFG;
+using namespace LSFG_3_1P;
 
 Context::Context(Vulkan& vk,
         int in0, int in1, const std::vector<int>& outN,

lsfg-vk-v3.1p/src/shaders/alpha.cpp

@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1P::Shaders;
 
 Alpha::Alpha(Vulkan& vk, Core::Image inImg) : inImg(std::move(inImg)) {
     // create resources

lsfg-vk-v3.1p/src/shaders/beta.cpp

@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1P::Shaders;
 
 Beta::Beta(Vulkan& vk, std::array<std::array<Core::Image, 2>, 3> inImgs)
         : inImgs(std::move(inImgs)) {

lsfg-vk-v3.1p/src/shaders/delta.cpp

@@ -11,7 +11,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1P::Shaders;
 
 Delta::Delta(Vulkan& vk, std::array<std::array<Core::Image, 2>, 3> inImgs1,
         Core::Image inImg2,

lsfg-vk-v3.1p/src/shaders/gamma.cpp

@@ -11,7 +11,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1P::Shaders;
 
 Gamma::Gamma(Vulkan& vk, std::array<std::array<Core::Image, 2>, 3> inImgs1,
         Core::Image inImg2,

lsfg-vk-v3.1p/src/shaders/generate.cpp

@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1P::Shaders;
 
 Generate::Generate(Vulkan& vk,
     Core::Image inImg1, Core::Image inImg2,

lsfg-vk-v3.1p/src/shaders/mipmaps.cpp

@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <cstdint>
 
-using namespace LSFG::Shaders;
+using namespace LSFG_3_1P::Shaders;
 
 Mipmaps::Mipmaps(Vulkan& vk,
         Core::Image inImg_0, Core::Image inImg_1)

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;