style fixup

godotengine · Sep 27, 2024 · 3e740af · 3e740af
1 parent 045b5cf
commit 3e740af
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/servers/rendering/instance_uniforms.cpp b/servers/rendering/instance_uniforms.cpp
@@ -53,7 +53,7 @@ void InstanceUniforms::materials_append(RID p_material) {
 	List<RendererMaterialStorage::InstanceShaderParam> params;
 	RSG::material_storage->material_get_instance_shader_parameters(p_material, &params);
 
-	for (RendererMaterialStorage::InstanceShaderParam const &srcp : params) {
+	for (const RendererMaterialStorage::InstanceShaderParam &srcp : params) {
 		StringName name = srcp.info.name;
 		if (Item *ptr = _parameters.getptr(name); ptr) {
 			if (!ptr->is_valid()) {
@@ -84,7 +84,7 @@ bool InstanceUniforms::materials_finish(RID p_self) {
 		return false;
 	}
 
-	bool const should_alloc = !is_allocated();
+	const bool should_alloc = !is_allocated();
 
 	if (should_alloc) {
 		_location = RSG::material_storage->global_shader_parameters_instance_allocate(p_self);
@@ -100,14 +100,14 @@ bool InstanceUniforms::materials_finish(RID p_self) {
 	return should_alloc;
 }
 
-Variant InstanceUniforms::get(StringName const &p_name) const {
-	if (Item const *ptr = _parameters.getptr(p_name); ptr) {
+Variant InstanceUniforms::get(const StringName &p_name) const {
+	if (const Item *ptr = _parameters.getptr(p_name); ptr) {
 		return ptr->value;
 	}
 	return Variant();
 }
 
-void InstanceUniforms::set(RID p_self, StringName const &p_name, Variant const &p_value) {
+void InstanceUniforms::set(RID p_self, const StringName &p_name, const Variant &p_value) {
 	ERR_FAIL_COND(!p_self.is_valid());
 	ERR_FAIL_COND(p_value.get_type() == Variant::OBJECT);
 
@@ -123,8 +123,8 @@ void InstanceUniforms::set(RID p_self, StringName const &p_name, Variant const &
 	}
 }
 
-Variant InstanceUniforms::get_default(StringName const &p_name) const {
-	if (Item const *ptr = _parameters.getptr(p_name); ptr) {
+Variant InstanceUniforms::get_default(const StringName &p_name) const {
+	if (const Item *ptr = _parameters.getptr(p_name); ptr) {
 		return ptr->default_value;
 	}
 	return Variant();
@@ -134,21 +134,21 @@ void InstanceUniforms::get_property_list(List<PropertyInfo> &r_parameters) const
 	Vector<StringName> names;
 
 	// Invalid items won't be saved, but will remain in memory in case of shader compilation failure.
-	for (KeyValue<StringName, Item> const &kv : _parameters) {
+	for (const KeyValue<StringName, Item> &kv : _parameters) {
 		if (kv.value.is_valid()) {
 			names.push_back(kv.key);
 		}
 	}
 
 	names.sort_custom<StringName::AlphCompare>();
 
-	for (StringName const &n : names) {
+	for (const StringName &n : names) {
 		PropertyInfo pinfo = _parameters[n].info;
 		r_parameters.push_back(pinfo);
 	}
 }
 
-void InstanceUniforms::_init_param(Item &r_item, RendererMaterialStorage::InstanceShaderParam const &p_param) const {
+void InstanceUniforms::_init_param(Item &r_item, const RendererMaterialStorage::InstanceShaderParam &p_param) const {
 	r_item.index = p_param.index;
 	r_item.flags = 0;
 	r_item.info = p_param.info;

diff --git a/servers/rendering/instance_uniforms.h b/servers/rendering/instance_uniforms.h
@@ -45,10 +45,10 @@ class InstanceUniforms {
 	// Assign location() to instance offset if materials_finish returns true.
 	[[nodiscard]] bool materials_finish(RID p_self);
 
-	[[nodiscard]] Variant get(StringName const &p_name) const;
-	void set(RID p_self, StringName const &p_name, Variant const &p_value);
+	[[nodiscard]] Variant get(const StringName &p_name) const;
+	void set(RID p_self, const StringName &p_name, const Variant &p_value);
 
-	[[nodiscard]] Variant get_default(StringName const &p_name) const;
+	[[nodiscard]] Variant get_default(const StringName &p_name) const;
 	void get_property_list(List<PropertyInfo> &r_parameters) const;
 
 	[[nodiscard]] inline int32_t location() const { return _location; }
@@ -67,7 +67,7 @@ class InstanceUniforms {
 	int32_t _location = -1;
 	HashMap<StringName, Item> _parameters;
 
-	void _init_param(Item &r_item, RendererMaterialStorage::InstanceShaderParam const &p_param) const;
+	void _init_param(Item &r_item, const RendererMaterialStorage::InstanceShaderParam &p_param) const;
 	void _invalidate_items();
 };
 

diff --git a/servers/rendering/renderer_canvas_cull.cpp b/servers/rendering/renderer_canvas_cull.cpp
@@ -46,8 +46,8 @@ const static float FEATHER_SIZE = 1.25f;
 
 static RendererCanvasCull *_canvas_cull_singleton{};
 
-void RendererCanvasCull::_dependency_changed(Dependency::DependencyChangedNotification p_notification, DependencyTracker *tracker) {
-	Item *item = (Item *)tracker->userdata;
+void RendererCanvasCull::_dependency_changed(Dependency::DependencyChangedNotification p_notification, DependencyTracker *p_tracker) {
+	Item *item = (Item *)p_tracker->userdata;
 
 	switch (p_notification) {
 		case Dependency::DEPENDENCY_CHANGED_MATERIAL: {
@@ -58,8 +58,8 @@ void RendererCanvasCull::_dependency_changed(Dependency::DependencyChangedNotifi
 	}
 }
 
-void RendererCanvasCull::_dependency_deleted(const RID &p_dependency, DependencyTracker *tracker) {
-	Item *item = (Item *)tracker->userdata;
+void RendererCanvasCull::_dependency_deleted(const RID &p_dependency, DependencyTracker *p_tracker) {
+	Item *item = (Item *)p_tracker->userdata;
 
 	if (p_dependency == item->material) {
 		_canvas_cull_singleton->canvas_item_set_material(item->self, RID());

diff --git a/servers/rendering/renderer_canvas_cull.h b/servers/rendering/renderer_canvas_cull.h
@@ -32,13 +32,13 @@
 #define RENDERER_CANVAS_CULL_H
 
 #include "core/templates/paged_allocator.h"
-#include "instance_uniforms.h"
 #include "renderer_compositor.h"
 #include "renderer_viewport.h"
+#include "servers/rendering/instance_uniforms.h"
 
 class RendererCanvasCull {
-	static void _dependency_changed(Dependency::DependencyChangedNotification p_notification, DependencyTracker *tracker);
-	static void _dependency_deleted(const RID &p_dependency, DependencyTracker *tracker);
+	static void _dependency_changed(Dependency::DependencyChangedNotification p_notification, DependencyTracker *p_tracker);
+	static void _dependency_deleted(const RID &p_dependency, DependencyTracker *p_tracker);
 
 public:
 	struct Item : public RendererCanvasRender::Item {

diff --git a/servers/rendering/renderer_scene_cull.h b/servers/rendering/renderer_scene_cull.h
@@ -40,7 +40,7 @@
 #include "core/templates/pass_func.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
-#include "instance_uniforms.h"
+#include "servers/rendering/instance_uniforms.h"
 #include "servers/rendering/renderer_scene_occlusion_cull.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_method.h"