From 517aa81938aaaca0882f8423fa525927aa18a6c3 Mon Sep 17 00:00:00 2001 From: Mads Buvik Sandvei Date: Wed, 29 Jan 2025 22:35:19 +0100 Subject: [PATCH] Change sky blending fix to remove changing the "sky" texture slot when disabling sky blending. --- apps/openmw/mwrender/characterpreview.cpp | 3 --- apps/openmw/mwrender/localmap.cpp | 6 ------ 2 files changed, 9 deletions(-) diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp index a6e9b848b4..18604e78ca 100644 --- a/apps/openmw/mwrender/characterpreview.cpp +++ b/apps/openmw/mwrender/characterpreview.cpp @@ -258,11 +258,8 @@ namespace MWRender // TODO: Clean up this mess of loose uniforms that shaders depend on. // turn off sky blending - int skyTextureSlot = mResourceSystem->getSceneManager()->getShaderManager().reserveGlobalTextureUnits( - Shader::ShaderManager::Slot::SkyTexture); stateset->addUniform(new osg::Uniform("far", 10000000.0f)); stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f)); - stateset->addUniform(new osg::Uniform("sky", skyTextureSlot)); stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 })); stateset->addUniform(new osg::Uniform("emissiveMult", 1.f)); diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index d51088d729..6785ce29bf 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -736,14 +736,8 @@ namespace MWRender stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE); // turn of sky blending - int skyTextureSlot = MWBase::Environment::get() - .getResourceSystem() - ->getSceneManager() - ->getShaderManager() - .reserveGlobalTextureUnits(Shader::ShaderManager::Slot::SkyTexture); stateset->addUniform(new osg::Uniform("far", 10000000.0f)); stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f)); - stateset->addUniform(new osg::Uniform("sky", skyTextureSlot)); stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 })); osg::ref_ptr lightmodel = new osg::LightModel;