TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

pgraph: Fix unnecessary double state munge in prepare_scene()

Browse Source 
[skip ci]
This commit is contained in:
rdb 2021-12-13 13:22:06 +01:00
parent 68f0931f43
commit a4d53a8ced
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/pgraph/geomNode.cxx
View File

@ -394,11 +394,6 @@ r_prepare_scene(GraphicsStateGuardianBase *gsg, const RenderState *node_state,
prepared_objects->enqueue_index_buffer((GeomPrimitive *)prim.p()); prepared_objects->enqueue_index_buffer((GeomPrimitive *)prim.p());
} }
if (munger->is_of_type(StateMunger::get_class_type())) {
StateMunger *state_munger = (StateMunger *)munger.p();
geom_state = state_munger->munge_state(geom_state);
}
// As well as the shaders. // As well as the shaders.
const ShaderAttrib *sa; const ShaderAttrib *sa;
if (geom_state->get_attrib(sa)) { if (geom_state->get_attrib(sa)) {
@ -412,8 +407,10 @@ r_prepare_scene(GraphicsStateGuardianBase *gsg, const RenderState *node_state,
else if (munger->is_of_type(StateMunger::get_class_type())) { else if (munger->is_of_type(StateMunger::get_class_type())) {
// Premunge the state for the fixed-function pipeline. // Premunge the state for the fixed-function pipeline.
StateMunger *state_munger = (StateMunger *)munger.p(); StateMunger *state_munger = (StateMunger *)munger.p();
if (state_munger->should_munge_state()) {
geom_state = state_munger->munge_state(geom_state); geom_state = state_munger->munge_state(geom_state);
} }
}
// TODO: prepare the shader inputs. // TODO: prepare the shader inputs.
} }