diff --git a/src/graphics/sp/sp_base.cpp b/src/graphics/sp/sp_base.cpp index 9ba1f250d..4c81c445e 100644 --- a/src/graphics/sp/sp_base.cpp +++ b/src/graphics/sp/sp_base.cpp @@ -199,12 +199,9 @@ void displaceShaderInit(SPShader* shader) g_stk_sbr->getRTTs()->getFBO(FBO_DISPLACE).bind(), glClear(GL_COLOR_BUFFER_BIT); }, RP_RESERVED); - shader->addCustomPrefilledTextures(ST_BILINEAR, - GL_TEXTURE_2D, "displacement_tex", []()->GLuint - { - return irr_driver->getTexture(FileManager::TEXTURE, - "displace.png")->getOpenGLTextureName(); - }, RP_RESERVED); + SPShaderManager::addPrefilledTexturesToShader(shader, + {{ "displacement_tex", "displace.png", false/*srgb*/, ST_BILINEAR }}, + RP_RESERVED); shader->addCustomPrefilledTextures(ST_BILINEAR, GL_TEXTURE_2D, "mask_tex", []()->GLuint { diff --git a/src/graphics/sp/sp_shader_manager.hpp b/src/graphics/sp/sp_shader_manager.hpp index 2d27b8e97..dca4aeb50 100644 --- a/src/graphics/sp/sp_shader_manager.hpp +++ b/src/graphics/sp/sp_shader_manager.hpp @@ -108,10 +108,6 @@ private: const std::array& pi, const UniformAssigners& ua, bool skinned); - // ------------------------------------------------------------------------ - static void addPrefilledTexturesToShader(SPShader* s, - const std::vector >& t, RenderPass rp); public: // ------------------------------------------------------------------------ @@ -130,6 +126,10 @@ public: m_spsm = NULL; } // ------------------------------------------------------------------------ + static void addPrefilledTexturesToShader(SPShader* s, + const std::vector >& t, RenderPass rp); + // ------------------------------------------------------------------------ SPShaderManager(); // ------------------------------------------------------------------------ ~SPShaderManager();