TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix state tracking bug passing view parameters to shader

Browse Source 
These parameters are already taken care of by set_state_and_transform().

Also comment out a few lines of code that would prevent the latter from being called for transform changes, but which never triggered anyway.
This commit is contained in:
rdb 2020-09-09 18:05:35 +02:00
parent 3daf1ae1b1
commit d997be50ff
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -3992,12 +3992,6 @@ prepare_lens() {
} }
#endif #endif
#ifndef OPENGLES_1
if (_current_shader_context) {
_current_shader_context->issue_parameters(Shader::SSD_transform);
}
#endif
return true; return true;
} }
@ -11205,9 +11199,10 @@ set_state_and_transform(const RenderState *target,
do_issue_transform(); do_issue_transform();
} }
if (target == _state_rs && (_state_mask | _inv_state_mask).is_all_on()) { //XXX the _inv_state_mask system does not appear to be used at the moment.
return; //if (target == _state_rs && (_state_mask | _inv_state_mask).is_all_on()) {
} // return;
//}
_target_rs = target; _target_rs = target;
#ifndef OPENGLES_1 #ifndef OPENGLES_1