mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-26 12:36:48 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Alexei Dobrohotov 2023-03-01 00:52:37 +03:00
parent a7116aacbc
commit d33be39fb6
2 changed files with 32 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -157,6 +157,7 @@
Bug #6937: Divided by Nix Hounds quest is broken Bug #6937: Divided by Nix Hounds quest is broken
Bug #7008: Race condition on initializing a vector of reserved node names Bug #7008: Race condition on initializing a vector of reserved node names
Bug #7121: Crash on TimeStamp construction with invalid hour value Bug #7121: Crash on TimeStamp construction with invalid hour value
Bug #7251: Force shaders setting still renders some drawables with FFP
Feature #890: OpenMW-CS: Column filtering Feature #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable" Feature #2491: Ability to make OpenMW "portable"

26
components/shader/shadervisitor.cpp
View file

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