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

Move ShaderWarning definitions into rendering_server

This commit is contained in:
smosages 2023-02-19 15:35:05 +01:00
parent 9ad8dfa6cc
commit 786ad514df
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/plugins/text_shader_editor.cpp
View File

@ -1051,11 +1051,6 @@ void TextShaderEditor::_make_context_menu(bool p_selection, Vector2 p_position)
} }
TextShaderEditor::TextShaderEditor() { TextShaderEditor::TextShaderEditor() {
GLOBAL_DEF("debug/shader_language/warnings/enable", true);
GLOBAL_DEF("debug/shader_language/warnings/treat_warnings_as_errors", false);
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);
}
_update_warnings(false); _update_warnings(false);
shader_editor = memnew(ShaderTextEditor); shader_editor = memnew(ShaderTextEditor);

10
servers/rendering_server.cpp
View File

@ -35,6 +35,7 @@
#include "core/variant/typed_array.h" #include "core/variant/typed_array.h"
#include "servers/rendering/rendering_server_globals.h" #include "servers/rendering/rendering_server_globals.h"
#include "servers/rendering/shader_language.h" #include "servers/rendering/shader_language.h"
#include "servers/rendering/shader_warnings.h"
RenderingServer *RenderingServer::singleton = nullptr; RenderingServer *RenderingServer::singleton = nullptr;
RenderingServer *(*RenderingServer::create_func)() = nullptr; RenderingServer *(*RenderingServer::create_func)() = nullptr;
@ -2978,6 +2979,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(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_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() { RenderingServer::~RenderingServer() {