From ce51cd23fa7bc3ebc8e7cffa24db1e4eee3a9fde Mon Sep 17 00:00:00 2001
From: Almamu <wpengine@alma.mu>
Date: Wed, 20 Aug 2025 00:46:11 +0200
Subject: [PATCH] chore: fix default uniform values not being applied in the
 right order

---
 src/WallpaperEngine/Render/Objects/CImage.cpp        | 2 +-
 src/WallpaperEngine/Render/Objects/Effects/CPass.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/WallpaperEngine/Render/Objects/CImage.cpp b/src/WallpaperEngine/Render/Objects/CImage.cpp
index 86c23a2..a04f7c1 100644
--- a/src/WallpaperEngine/Render/Objects/CImage.cpp
+++ b/src/WallpaperEngine/Render/Objects/CImage.cpp
@@ -89,7 +89,7 @@ CImage::CImage (Wallpapers::CScene& scene, const Image& image) :
     if (!textures.empty ()) {
         std::string textureName = textures.begin ()->second;
 
-        if (textureName.find ("_rt_") == 0) {
+        if (textureName.find ("_rt_") == 0 || textureName.find ("_alias_") == 0) {
             this->m_texture = this->getScene ().findFBO (textureName);
         } else {
             // get the first texture on the first pass (this one represents the image assigned to this object)
diff --git a/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp b/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp
index a5443da..03a0d81 100644
--- a/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp
+++ b/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp
@@ -53,7 +53,6 @@ CPass::CPass (
     m_fboProvider (std::move(fboProvider)),
     m_target (target) {
     this->setupShaders ();
-    this->setupShaderVariables ();
 }
 
 std::shared_ptr<const ITexture> CPass::resolveTexture (std::shared_ptr<const ITexture> expected, int index, std::shared_ptr<const ITexture> previous) {
@@ -471,6 +470,8 @@ void CPass::setupShaders () {
     glDeleteShader (vertexShaderID);
     glDeleteShader (fragmentShaderID);
 
+    // first setup the default values, these will be overwritten by future values
+    this->setupShaderVariables ();
     // setup uniforms
     this->setupUniforms ();
     // setup attributes too