mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-18 09:46:40 +00:00
Code Issues Releases Wiki Activity

Revert "Attach shaders to geometry that lacks a stateset if necessary (bug #7251)"

Browse source 
This reverts commit d33be39fb6.
This commit is contained in:
AnyOldName3 2023-03-11 19:06:33 +00:00
parent 5c2f4f462e
commit c223b214bd
1 changed files with 53 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
components/shader/shadervisitor.cpp
View file

@ -820,24 +820,42 @@ namespace Shader
void ShaderVisitor::apply(osg::Geometry& geometry)
{
pushRequirements(geometry);
bool needPop = (geometry.getStateSet() != nullptr);
if (geometry.getStateSet()) // TODO: check if stateset affects shader permutation before pushing it
{
pushRequirements(geometry);
applyStateSet(geometry.getStateSet(), geometry);
}
if (!mRequirements.empty())
{
const ShaderRequirements& reqs = mRequirements.back();
adjustGeometry(geometry, reqs);
createProgram(reqs);
adjustGeometry(geometry, reqs);
createProgram(reqs);
}
else
ensureFFP(geometry);
if (needPop)
popRequirements();
}
void ShaderVisitor::apply(osg::Drawable& drawable)
{
bool needPop = drawable.getStateSet();
if (needPop)
{
pushRequirements(drawable);
if (drawable.getStateSet())
applyStateSet(drawable.getStateSet(), drawable);
}
if (!mRequirements.empty())
{
const ShaderRequirements& reqs = mRequirements.back();
createProgram(reqs);
@ -863,6 +881,12 @@ namespace Shader
osgaRig->setSourceRigGeometry(sourceOsgaRigGeometry);
}
}
}
else
ensureFFP(drawable);
if (needPop)
popRequirements();
}