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

Don't give misleading error when image shader input is missing

Browse Source
This commit is contained in:
rdb 2016-11-03 11:11:02 +01:00
parent 1467541b8d
commit 7bef96e71d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2413,16 +2413,24 @@ update_shader_texture_bindings(ShaderContext *prev) {
Texture *tex; Texture *tex;
const ShaderInput *sinp = _glgsg->_target_shader->get_shader_input(input._name); const ShaderInput *sinp = _glgsg->_target_shader->get_shader_input(input._name);
if (sinp->get_value_type() == ShaderInput::M_texture_image) { switch (sinp->get_value_type()) {
case ShaderInput::M_texture_image:
param = (const ParamTextureImage *)sinp->get_param(); param = (const ParamTextureImage *)sinp->get_param();
tex = param->get_texture(); tex = param->get_texture();
break;
} else if (sinp->get_value_type() == ShaderInput::M_texture) { case ShaderInput::M_texture:
// People find it convenient to be able to pass a texture without // People find it convenient to be able to pass a texture without
// further ado. // further ado.
tex = sinp->get_texture(); tex = sinp->get_texture();
break;
} else { case ShaderInput::M_invalid:
GLCAT.error()
<< "Missing texture image binding input " << *input._name << "\n";
continue;
default:
GLCAT.error() GLCAT.error()
<< "Mismatching type for parameter " << *input._name << ", expected texture image binding\n"; << "Mismatching type for parameter " << *input._name << ", expected texture image binding\n";
continue; continue;