From db22b7ded04e2cf7eac1c9a05d625b8b00e2f003 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 3 Apr 2022 19:09:09 +0200 Subject: Rename shader parameter uniform setter/getter methods for consistency `shader_uniform` is now consistenly used across both per-shader and per-instance shader uniform methods. This makes methods easier to find in the class reference when looking for them. --- servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp | 2 +- .../renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp | 2 +- .../rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'servers/rendering/renderer_rd/forward_mobile') diff --git a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp index f74ad7617d..ffd47cc163 100644 --- a/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp +++ b/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp @@ -1903,7 +1903,7 @@ void RenderForwardMobile::_render_list_template(RenderingDevice::DrawListID p_dr push_constant.flags = inst->flags_cache; push_constant.gi_offset = inst->gi_offset_cache; push_constant.layer_mask = inst->layer_mask; - push_constant.instance_uniforms_ofs = uint32_t(inst->shader_parameters_offset); + push_constant.instance_uniforms_ofs = uint32_t(inst->shader_uniforms_offset); if (p_params->pass_mode == PASS_MODE_DEPTH_MATERIAL) { // abuse lightmap_uv_scale[0] here, should not be needed here diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp index ed5399a3af..01b54607bc 100644 --- a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp +++ b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp @@ -349,7 +349,7 @@ void SceneShaderForwardMobile::ShaderData::set_default_texture_param(const Strin } } -void SceneShaderForwardMobile::ShaderData::get_param_list(List *p_param_list) const { +void SceneShaderForwardMobile::ShaderData::get_shader_uniform_list(List *p_param_list) const { HashMap order; for (const KeyValue &E : uniforms) { diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h index 1bb8a08ccf..e208334547 100644 --- a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h +++ b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h @@ -142,7 +142,7 @@ public: virtual void set_path_hint(const String &p_path); virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index); - virtual void get_param_list(List *p_param_list) const; + virtual void get_shader_uniform_list(List *p_param_list) const; void get_instance_param_list(List *p_param_list) const; virtual bool is_param_texture(const StringName &p_param) const; -- cgit v1.2.3