godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not error on empty shader, just treat it as invalid by default. Fixes #15998.

This commit is contained in:
Juan Linietsky 2018-11-14 10:57:43 -03:00
parent 55f5f4757e
commit 4d88721e62
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -1125,6 +1125,10 @@ void RasterizerStorageGLES2::_update_shader(Shader *p_shader) const {
p_shader->uniforms.clear(); p_shader->uniforms.clear();
if (p_shader->code == String()) {
return; //just invalid, but no error
}
ShaderCompilerGLES2::GeneratedCode gen_code; ShaderCompilerGLES2::GeneratedCode gen_code;
ShaderCompilerGLES2::IdentifierActions *actions = NULL; ShaderCompilerGLES2::IdentifierActions *actions = NULL;

4
drivers/gles3/rasterizer_storage_gles3.cpp
View File

@ -1903,6 +1903,10 @@ void RasterizerStorageGLES3::_update_shader(Shader *p_shader) const {
p_shader->uniforms.clear(); p_shader->uniforms.clear();
if (p_shader->code == String()) {
return; //just invalid, but no error
}
ShaderCompilerGLES3::GeneratedCode gen_code; ShaderCompilerGLES3::GeneratedCode gen_code;
ShaderCompilerGLES3::IdentifierActions *actions = NULL; ShaderCompilerGLES3::IdentifierActions *actions = NULL;