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

Merge pull request #51548 from Chaosus/shader_silence_error

Browse Source 
Removes an internal error report if shader fails compile
This commit is contained in:
Rémi Verschelde 2021-08-12 09:44:05 +02:00 committed by GitHub
commit 22ccb74aff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
View File

@ -131,8 +131,9 @@ void SceneShaderForwardClustered::ShaderData::set_code(const String &p_code) {
SceneShaderForwardClustered *shader_singleton = (SceneShaderForwardClustered *)SceneShaderForwardClustered::singleton;
Error err = shader_singleton->compiler.compile(RS::SHADER_SPATIAL, code, &actions, path, gen_code);
ERR_FAIL_COND(err != OK);
if (err != OK) {
return;
}
if (version.is_null()) {
version = shader_singleton->shader.version_create();

4
servers/rendering/renderer_rd/shader_rd.h
View File

@ -142,7 +142,9 @@ public:
ERR_FAIL_COND_V(!variants_enabled[p_variant], RID());
Version *version = version_owner.getornull(p_version);
ERR_FAIL_COND_V(!version, RID());
if (!version) {
return RID();
}
if (version->dirty) {
_compile_version(version);