TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix misleading errors from p3d_LightSource[].shadowMap

Browse Source
This commit is contained in:
rdb 2018-12-26 23:31:48 +01:00
parent 669a655366
commit 981c44f636
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2797,14 +2797,24 @@ update_shader_texture_bindings(ShaderContext *prev) {
} }
if (tex->get_texture_type() != spec._desired_type) { if (tex->get_texture_type() != spec._desired_type) {
if (id != nullptr) { switch (spec._part) {
case Shader::STO_named_input:
GLCAT.error() GLCAT.error()
<< "Sampler type of GLSL shader input '" << *id << "' does not " << "Sampler type of GLSL shader input '" << *id << "' does not "
"match type of texture " << *tex << ".\n"; "match type of texture " << *tex << ".\n";
} else { break;
case Shader::STO_stage_i:
GLCAT.error() GLCAT.error()
<< "Sampler type of GLSL shader input p3d_Texture" << spec._stage << "Sampler type of GLSL shader input p3d_Texture" << spec._stage
<< " does not match type of texture " << *tex << ".\n"; << " does not match type of texture " << *tex << ".\n";
break;
case Shader::STO_light_i_shadow_map:
GLCAT.error()
<< "Sampler type of GLSL shader input p3d_LightSource[" << spec._stage
<< "].shadowMap does not match type of texture " << *tex << ".\n";
break;
} }
// TODO: also check whether shadow sampler textures have shadow filter // TODO: also check whether shadow sampler textures have shadow filter
// enabled. // enabled.