diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-09 19:28:17 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-09 19:28:17 +0200 |
commit | de14109862edd8f8e27fa0f6ec92f5d7f2b9df7f (patch) | |
tree | 6cbad3b9a9e91f5aeec293b81d20ffe72d588828 /servers/rendering_server.cpp | |
parent | b0b23082c4d8cdcf20c090159f33726317504bdc (diff) | |
parent | 786ad514df8a91103c12ec178366395622eef5a4 (diff) | |
download | redot-engine-de14109862edd8f8e27fa0f6ec92f5d7f2b9df7f.tar.gz |
Merge pull request #73588 from smosages/resolve-display-shader-settings-in-settings-editor
Define shader language project settings before creation of `TextShaderEditor` object.
Diffstat (limited to 'servers/rendering_server.cpp')
-rw-r--r-- | servers/rendering_server.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index b8b642fac1..43233073ff 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -35,6 +35,7 @@ #include "core/variant/typed_array.h" #include "servers/rendering/rendering_server_globals.h" #include "servers/rendering/shader_language.h" +#include "servers/rendering/shader_warnings.h" RenderingServer *RenderingServer::singleton = nullptr; RenderingServer *(*RenderingServer::create_func)() = nullptr; @@ -2990,6 +2991,15 @@ void RenderingServer::init() { GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "rendering/limits/opengl/max_lights_per_object", PROPERTY_HINT_RANGE, "2,1024,1"), 8); GLOBAL_DEF_RST_BASIC("xr/shaders/enabled", false); + + GLOBAL_DEF("debug/shader_language/warnings/enable", true); + GLOBAL_DEF("debug/shader_language/warnings/treat_warnings_as_errors", false); + +#ifdef DEBUG_ENABLED + for (int i = 0; i < (int)ShaderWarning::WARNING_MAX; i++) { + GLOBAL_DEF("debug/shader_language/warnings/" + ShaderWarning::get_name_from_code((ShaderWarning::Code)i).to_lower(), true); + } +#endif } RenderingServer::~RenderingServer() { |