godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Removes an internal error report if shader fails compile

Browse Source
This commit is contained in:
Yuri Roubinsky
2021-08-12 10:07:02 +03:00
parent e2ca1d413e
commit 63c7d5c330
2 changed files with 6 additions and 3 deletions
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; SceneShaderForwardClustered *shader_singleton = (SceneShaderForwardClustered *)SceneShaderForwardClustered::singleton;
Error err = shader_singleton->compiler.compile(RS::SHADER_SPATIAL, code, &actions, path, gen_code); Error err = shader_singleton->compiler.compile(RS::SHADER_SPATIAL, code, &actions, path, gen_code);
if (err != OK) {
ERR_FAIL_COND(err != OK); return;
}
if (version.is_null()) { if (version.is_null()) {
version = shader_singleton->shader.version_create(); 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()); ERR_FAIL_COND_V(!variants_enabled[p_variant], RID());
Version *version = version_owner.getornull(p_version); Version *version = version_owner.getornull(p_version);
ERR_FAIL_COND_V(!version, RID()); if (!version) {
return RID();
}
if (version->dirty) { if (version->dirty) {
_compile_version(version); _compile_version(version);