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

Merge pull request #100128 from clayjohn/rd-shader-spam

Browse Source 
Avoid error spam when shaders fail to compile by freeing shader_data version when compilation fails
This commit is contained in:
Thaddeus Crews
2024-12-09 14:33:16 -06:00
parent e7cdbf827b fce34f22a2
commit 5f5f86bff0
5 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
View File

@@ -1517,7 +1517,13 @@ void RendererCanvasRenderRD::CanvasShaderData::set_code(const String &p_code) {
MutexLock lock(canvas_singleton->shader.mutex);
Error err = canvas_singleton->shader.compiler.compile(RS::SHADER_CANVAS_ITEM, code, &actions, path, gen_code);
ERR_FAIL_COND_MSG(err != OK, "Shader compilation failed.");
if (err != OK) {
if (version.is_valid()) {
canvas_singleton->shader.canvas_shader.version_free(version);
version = RID();
}
ERR_FAIL_MSG("Shader compilation failed.");
}
uses_screen_texture_mipmaps = gen_code.uses_screen_texture_mipmaps;
uses_screen_texture = gen_code.uses_screen_texture;
@@ -1593,9 +1599,13 @@ uint64_t RendererCanvasRenderRD::CanvasShaderData::get_vertex_input_mask(ShaderV
}
bool RendererCanvasRenderRD::CanvasShaderData::is_valid() const {
RendererCanvasRenderRD *canvas_singleton = static_cast<RendererCanvasRenderRD *>(RendererCanvasRender::singleton);
MutexLock lock(canvas_singleton->shader.mutex);
return canvas_singleton->shader.canvas_shader.version_is_valid(version);
if (version.is_valid()) {
RendererCanvasRenderRD *canvas_singleton = static_cast<RendererCanvasRenderRD *>(RendererCanvasRender::singleton);
MutexLock lock(canvas_singleton->shader.mutex);
return canvas_singleton->shader.canvas_shader.version_is_valid(version);
} else {
return false;
}
}
RendererCanvasRenderRD::CanvasShaderData::CanvasShaderData() {