RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix fog-flickering-nametag issue: shaders not resetting fog state

This commit is contained in:
David Rose 2009-09-14 22:50:31 +00:00
parent c4dfa24ca4
commit b137e55464
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -3418,14 +3418,12 @@ set_state_and_transform(const RenderState *target,
_state_mask.set_bit(stencil_slot);
}
if (_current_shader_context == 0) {
int fog_slot = FogAttrib::get_class_slot();
if (_target_rs->get_attrib(fog_slot) != _state_rs->get_attrib(fog_slot) ||
!_state_mask.get_bit(fog_slot)) {
//PStatTimer timer(_draw_set_state_fog_pcollector);
do_issue_fog();
_state_mask.set_bit(fog_slot);
}
int fog_slot = FogAttrib::get_class_slot();
if (_target_rs->get_attrib(fog_slot) != _state_rs->get_attrib(fog_slot) ||
!_state_mask.get_bit(fog_slot)) {
//PStatTimer timer(_draw_set_state_fog_pcollector);
do_issue_fog();
_state_mask.set_bit(fog_slot);
}
int scissor_slot = ScissorAttrib::get_class_slot();

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

@ -7009,19 +7009,13 @@ set_state_and_transform(const RenderState *target,
_state_mask.set_bit(stencil_slot);
}
#ifndef OPENGLES_1
if (_current_shader_context == 0) {
#endif
int fog_slot = FogAttrib::get_class_slot();
if (_target_rs->get_attrib(fog_slot) != _state_rs->get_attrib(fog_slot) ||
!_state_mask.get_bit(fog_slot)) {
//PStatTimer timer(_draw_set_state_fog_pcollector);
do_issue_fog();
_state_mask.set_bit(fog_slot);
}
#ifndef OPENGLES_1
int fog_slot = FogAttrib::get_class_slot();
if (_target_rs->get_attrib(fog_slot) != _state_rs->get_attrib(fog_slot) ||
!_state_mask.get_bit(fog_slot)) {
//PStatTimer timer(_draw_set_state_fog_pcollector);
do_issue_fog();
_state_mask.set_bit(fog_slot);
}
#endif
int scissor_slot = ScissorAttrib::get_class_slot();
if (_target_rs->get_attrib(scissor_slot) != _state_rs->get_attrib(scissor_slot) ||