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

shaders can exceed stated texture stage limits

Browse Source
This commit is contained in:
David Rose 2009-02-13 14:55:51 +00:00
parent a019d736ec
commit ae85a56385
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -345,6 +345,10 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) {
return; return;
} }
// We get the TextureAttrib directly from the _target_rs, not the
// filtered TextureAttrib in _target_texture.
const TextureAttrib *texattrib = DCAST(TextureAttrib, gsg->_target_rs->get_attrib(TextureAttrib::get_class_slot()));
for (int i=0; i<(int)_shader->_tex_spec.size(); i++) { for (int i=0; i<(int)_shader->_tex_spec.size(); i++) {
CGparameter p = _cg_parameter_map[_shader->_tex_spec[i]._id._seqno]; CGparameter p = _cg_parameter_map[_shader->_tex_spec[i]._id._seqno];
if (p == 0) continue; if (p == 0) continue;
@ -354,11 +358,11 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) {
const ShaderInput *input = gsg->_target_shader->get_shader_input(id); const ShaderInput *input = gsg->_target_shader->get_shader_input(id);
tex = input->get_texture(); tex = input->get_texture();
} else { } else {
if (_shader->_tex_spec[i]._stage >= gsg->_target_texture->get_num_on_stages()) { if (_shader->_tex_spec[i]._stage >= texattrib->get_num_on_stages()) {
continue; continue;
} }
TextureStage *stage = gsg->_target_texture->get_on_stage(_shader->_tex_spec[i]._stage); TextureStage *stage = texattrib->get_on_stage(_shader->_tex_spec[i]._stage);
tex = gsg->_target_texture->get_on_texture(stage); tex = texattrib->get_on_texture(stage);
} }
if (_shader->_tex_spec[i]._suffix != 0) { if (_shader->_tex_spec[i]._suffix != 0) {
// The suffix feature is inefficient. It is a temporary hack. // The suffix feature is inefficient. It is a temporary hack.