maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7495 from RandomShaper/more-uniform-reuse-fix

Browse source 
More uniform reuse fix (2.1)
This commit is contained in:
Rémi Verschelde 2017-01-11 10:34:41 +01:00 committed by GitHub
parent 40de567297 8589a1b117
commit fde651ebf8
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gles2/shader_compiler_gles2.cpp
View file

@ -571,15 +571,12 @@ Error ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) {
global_code+=uline;
if (uniforms) {
//if (uniforms->has(E->key())) {
// //repeated uniform, error
// ERR_EXPLAIN("Uniform already exists from other shader: "+String(E->key()));
// ERR_FAIL_COND_V(uniforms->has(E->key()),ERR_ALREADY_EXISTS);
//
// }
SL::Uniform u = E->get();
u.order+=ubase;
uniforms->insert(E->key(),u);
// Check to avoid uniforms with the same name being re-added to avoid overwriting entries
if (!uniforms->has(E->key())) {
SL::Uniform u = E->get();
u.order+=ubase;
uniforms->insert(E->key(),u);
}
}
}