diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-28 20:34:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 20:34:17 +0200 |
| commit | 8e0f328a80a4c01bc4788a9aa6daaeb3097b4fab (patch) | |
| tree | cd8ed89c8e953679ce42aa01925b4e9861137ec1 /servers/rendering/rendering_server_default.h | |
| parent | 1c820f19b1a0ba72316896ad354cb31391638a3b (diff) | |
| parent | 4b42379c8fb89c28a8c38e79ac3573f5b34f8fb4 (diff) | |
| download | redot-engine-8e0f328a80a4c01bc4788a9aa6daaeb3097b4fab.tar.gz | |
Merge pull request #59840 from Calinou/renderingserver-global-uniform-rename
Diffstat (limited to 'servers/rendering/rendering_server_default.h')
| -rw-r--r-- | servers/rendering/rendering_server_default.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/servers/rendering/rendering_server_default.h b/servers/rendering/rendering_server_default.h index 136ed3cf0b..21a94b88f2 100644 --- a/servers/rendering/rendering_server_default.h +++ b/servers/rendering/rendering_server_default.h @@ -900,7 +900,7 @@ public: FUNC1(canvas_set_shadow_texture_size, int) - /* GLOBAL VARIABLES */ + /* GLOBAL SHADER UNIFORMS */ #undef server_name #undef ServerName @@ -908,16 +908,16 @@ public: #define ServerName RendererMaterialStorage #define server_name RSG::material_storage - FUNC3(global_variable_add, const StringName &, GlobalVariableType, const Variant &) - FUNC1(global_variable_remove, const StringName &) - FUNC0RC(Vector<StringName>, global_variable_get_list) - FUNC2(global_variable_set, const StringName &, const Variant &) - FUNC2(global_variable_set_override, const StringName &, const Variant &) - FUNC1RC(GlobalVariableType, global_variable_get_type, const StringName &) - FUNC1RC(Variant, global_variable_get, const StringName &) + FUNC3(global_shader_uniform_add, const StringName &, GlobalShaderUniformType, const Variant &) + FUNC1(global_shader_uniform_remove, const StringName &) + FUNC0RC(Vector<StringName>, global_shader_uniform_get_list) + FUNC2(global_shader_uniform_set, const StringName &, const Variant &) + FUNC2(global_shader_uniform_set_override, const StringName &, const Variant &) + FUNC1RC(GlobalShaderUniformType, global_shader_uniform_get_type, const StringName &) + FUNC1RC(Variant, global_shader_uniform_get, const StringName &) - FUNC1(global_variables_load_settings, bool) - FUNC0(global_variables_clear) + FUNC1(global_shader_uniforms_load_settings, bool) + FUNC0(global_shader_uniforms_clear) #undef server_name #undef ServerName |