fix: black backgrounds on latest wallpaperengine version (g_Color4 wa…

…s added) Signed-off-by: Alexis Maiquez <[email protected]>
Almamu · Dec 14, 2023 · 170af5f · 170af5f
1 parent b8fd1ee
commit 170af5f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/WallpaperEngine/Render/CWallpaper.cpp b/src/WallpaperEngine/Render/CWallpaper.cpp
@@ -239,6 +239,8 @@ void CWallpaper::setupFramebuffers () {
     // create framebuffer for the scene
     this->m_sceneFBO = this->createFBO ("_rt_FullFrameBuffer", ITexture::TextureFormat::ARGB8888, clamp, 1.0, width,
                                         height, width, height);
+
+    this->aliasFBO ("_rt_MipMappedFrameBuffer", this->m_sceneFBO);
 }
 
 CAudioContext& CWallpaper::getAudioContext () {
@@ -255,6 +257,12 @@ CFBO* CWallpaper::createFBO (const std::string& name, ITexture::TextureFormat fo
     return fbo;
 }
 
+void CWallpaper::aliasFBO(const std::string& alias, CFBO* original)
+{
+    this->m_fbos.insert (std::make_pair (alias, original));
+}
+
+
 const std::map<std::string, CFBO*>& CWallpaper::getFBOs () const {
     return this->m_fbos;
 }

diff --git a/src/WallpaperEngine/Render/CWallpaper.h b/src/WallpaperEngine/Render/CWallpaper.h
@@ -81,6 +81,13 @@ class CWallpaper : public Helpers::CContextAware {
     CFBO* createFBO (const std::string& name, ITexture::TextureFormat format, ITexture::TextureFlags flags, float scale,
                      uint32_t realWidth, uint32_t realHeight, uint32_t textureWidth, uint32_t textureHeight);
 
+    /**
+     * Creates an alias of an existing fbo
+     * @param alias
+     * @param original
+     */
+    void aliasFBO (const std::string& alias, CFBO* original);
+
     /**
      * @return The full FBO list to work with
      */

diff --git a/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp b/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp
@@ -519,6 +519,7 @@ void CPass::setupUniforms () {
     this->addUniform ("g_UserAlpha", this->m_material->getImage ()->getImage ()->getAlpha ());
     this->addUniform ("g_Alpha", this->m_material->getImage ()->getImage ()->getAlpha ());
     this->addUniform ("g_Color", this->m_material->getImage ()->getImage ()->getColor ());
+    this->addUniform ("g_Color4", glm::vec4(this->m_material->getImage ()->getImage ()->getColor (), 1));
     // TODO: VALIDATE THAT G_COMPOSITECOLOR REALLY COMES FROM THIS ONE
     this->addUniform ("g_CompositeColor", this->m_material->getImage ()->getImage ()->getColor ());
     // add some external variables