clang-format: Various fixes to comments alignment from `clang-format` 13

All reviewed manually and occasionally rewritten to avoid bad auto formatting.

2 files changed, 24 insertions, 25 deletions

diff --git a/servers/rendering/renderer_rd/shaders/canvas.glsl b/servers/rendering/renderer_rd/shaders/canvas.glsl
index 2911e8b731..65a621b203 100644
--- a/servers/rendering/renderer_rd/shaders/canvas.glsl
+++ b/servers/rendering/renderer_rd/shaders/canvas.glsl
@@ -91,7 +91,6 @@ void main() {
 	uint instancing = draw_data.flags & FLAGS_INSTANCING_MASK;
 
 #ifdef USE_ATTRIBUTES
-
 	if (instancing > 1) {
 		// trails
 
@@ -128,37 +127,37 @@ void main() {
 
 		vertex = new_vertex;
 		color *= pcolor;
-
 	} else
 #endif // USE_ATTRIBUTES
+	{
+		if (instancing == 1) {
+			uint stride = 2;
+			{
+				if (bool(draw_data.flags & FLAGS_INSTANCING_HAS_COLORS)) {
+					stride += 1;
+				}
+				if (bool(draw_data.flags & FLAGS_INSTANCING_HAS_CUSTOM_DATA)) {
+					stride += 1;
+				}
+			}
+
+			uint offset = stride * gl_InstanceIndex;
+
+			mat4 matrix = mat4(transforms.data[offset + 0], transforms.data[offset + 1], vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0));
+			offset += 2;
 
-			if (instancing == 1) {
-		uint stride = 2;
-		{
 			if (bool(draw_data.flags & FLAGS_INSTANCING_HAS_COLORS)) {
-				stride += 1;
+				color *= transforms.data[offset];
+				offset += 1;
 			}
+
 			if (bool(draw_data.flags & FLAGS_INSTANCING_HAS_CUSTOM_DATA)) {
-				stride += 1;
+				instance_custom = transforms.data[offset];
 			}
-		}
-
-		uint offset = stride * gl_InstanceIndex;
 
-		mat4 matrix = mat4(transforms.data[offset + 0], transforms.data[offset + 1], vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0));
-		offset += 2;
-
-		if (bool(draw_data.flags & FLAGS_INSTANCING_HAS_COLORS)) {
-			color *= transforms.data[offset];
-			offset += 1;
-		}
-
-		if (bool(draw_data.flags & FLAGS_INSTANCING_HAS_CUSTOM_DATA)) {
-			instance_custom = transforms.data[offset];
+			matrix = transpose(matrix);
+			world_matrix = world_matrix * matrix;
 		}
-
-		matrix = transpose(matrix);
-		world_matrix = world_matrix * matrix;
 	}
 
 #if !defined(USE_ATTRIBUTES) && !defined(USE_PRIMITIVE)
diff --git a/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl b/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
index 79f64051c0..1a47d7c5f9 100644
--- a/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
+++ b/servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
@@ -1249,10 +1249,10 @@ void main() {
 // LIGHTING
 #if !defined(MODE_RENDER_DEPTH) && !defined(MODE_UNSHADED)
 
-	{ //directional light
+	{ // Directional light.
 
+		// Do shadow and lighting in two passes to reduce register pressure.
 #ifndef SHADOWS_DISABLED
-		// Do shadow and lighting in two passes to reduce register pressure
 		uint shadow0 = 0;
 		uint shadow1 = 0;