diff --git a/spirv_common.hpp b/spirv_common.hpp
index c8ddd2a..ac0a708 100644
--- a/spirv_common.hpp
+++ b/spirv_common.hpp
@@ -614,13 +614,13 @@ struct SPIRAccessChain : IVariant
 		type = TypeAccessChain
 	};
 
-	SPIRAccessChain(uint32_t basetype_, spv::StorageClass storage_,
-	                std::string base_, std::string dynamic_index_, int32_t static_index_)
-		: basetype(basetype_),
-		  storage(storage_),
-		  base(base_),
-		  dynamic_index(std::move(dynamic_index_)),
-		  static_index(static_index_)
+	SPIRAccessChain(uint32_t basetype_, spv::StorageClass storage_, std::string base_, std::string dynamic_index_,
+	                int32_t static_index_)
+	    : basetype(basetype_)
+	    , storage(storage_)
+	    , base(base_)
+	    , dynamic_index(std::move(dynamic_index_))
+	    , static_index(static_index_)
 	{
 	}
 
diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
index 908a555..54c8766 100644
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@@ -1127,8 +1127,9 @@ void CompilerGLSL::emit_buffer_block_native(const SPIRVariable &var)
 	else
 		resource_names.insert(buffer_name);
 
-	statement(layout_for_variable(var), is_coherent ? "coherent " : "", is_restrict ? "restrict " : "", is_writeonly ? "writeonly " : "",
-	          is_readonly ? "readonly " : "", ssbo ? "buffer " : "uniform ", buffer_name);
+	statement(layout_for_variable(var), is_coherent ? "coherent " : "", is_restrict ? "restrict " : "",
+	          is_writeonly ? "writeonly " : "", is_readonly ? "readonly " : "", ssbo ? "buffer " : "uniform ",
+	          buffer_name);
 
 	begin_scope();
 
@@ -4061,9 +4062,9 @@ std::string CompilerGLSL::flattened_access_chain_vector(uint32_t base, const uin
 	}
 }
 
-std::pair<std::string, uint32_t> CompilerGLSL::flattened_access_chain_offset(const SPIRType &basetype, const uint32_t *indices,
-                                                                             uint32_t count, uint32_t offset,
-                                                                             uint32_t word_stride,
+std::pair<std::string, uint32_t> CompilerGLSL::flattened_access_chain_offset(const SPIRType &basetype,
+                                                                             const uint32_t *indices, uint32_t count,
+                                                                             uint32_t offset, uint32_t word_stride,
                                                                              bool *need_transpose,
                                                                              uint32_t *out_matrix_stride)
 {
diff --git a/spirv_glsl.hpp b/spirv_glsl.hpp
index 466ef41..3558fa6 100644
--- a/spirv_glsl.hpp
+++ b/spirv_glsl.hpp
@@ -361,8 +361,7 @@ protected:
 	                                          bool need_transpose);
 	std::pair<std::string, uint32_t> flattened_access_chain_offset(const SPIRType &basetype, const uint32_t *indices,
 	                                                               uint32_t count, uint32_t offset,
-	                                                               uint32_t word_stride,
-	                                                               bool *need_transpose = nullptr,
+	                                                               uint32_t word_stride, bool *need_transpose = nullptr,
 	                                                               uint32_t *matrix_stride = nullptr);
 
 	const char *index_to_swizzle(uint32_t index);
diff --git a/spirv_hlsl.cpp b/spirv_hlsl.cpp
index 3fa813b..127e38b 100644
--- a/spirv_hlsl.cpp
+++ b/spirv_hlsl.cpp
@@ -956,8 +956,8 @@ void CompilerHLSL::emit_buffer_block(const SPIRVariable &var)
 		uint64_t flags = get_buffer_block_flags(var);
 		bool is_readonly = (flags & (1ull << DecorationNonWritable)) != 0;
 		add_resource_name(var.self);
-		statement(is_readonly ? "ByteAddressBuffer " : "RWByteAddressBuffer ",
-		          to_name(var.self), type_to_array_glsl(type), to_resource_binding(var), ";");
+		statement(is_readonly ? "ByteAddressBuffer " : "RWByteAddressBuffer ", to_name(var.self),
+		          type_to_array_glsl(type), to_resource_binding(var), ";");
 	}
 	else
 	{
@@ -1084,8 +1084,8 @@ void CompilerHLSL::emit_function_prototype(SPIRFunction &func, uint64_t return_f
 		{
 			// Manufacture automatic sampler arg for SampledImage texture
 			decl += ", ";
-			decl += join(arg_type.image.depth ? "SamplerComparisonState " : "SamplerState ",
-			             to_sampler_expression(arg.id));
+			decl +=
+			    join(arg_type.image.depth ? "SamplerComparisonState " : "SamplerState ", to_sampler_expression(arg.id));
 		}
 
 		if (&arg != &func.arguments.back())
@@ -1138,9 +1138,7 @@ void CompilerHLSL::emit_hlsl_entry_point()
 
 	if (execution.model == ExecutionModelGLCompute)
 	{
-		statement("[numthreads(",
-		          execution.workgroup_size.x, ", ",
-		          execution.workgroup_size.y, ", ",
+		statement("[numthreads(", execution.workgroup_size.x, ", ", execution.workgroup_size.y, ", ",
 		          execution.workgroup_size.z, ")]");
 	}
 
@@ -2031,10 +2029,9 @@ void CompilerHLSL::emit_access_chain(const Instruction &instruction)
 
 		uint32_t matrix_stride = 0;
 		bool need_transpose = false;
-		auto offsets = flattened_access_chain_offset(*basetype,
-		                                             &ops[3 + to_plain_buffer_length], length - 3 - to_plain_buffer_length,
-		                                             0, 1, &need_transpose, &matrix_stride);
-
+		auto offsets =
+		    flattened_access_chain_offset(*basetype, &ops[3 + to_plain_buffer_length],
+		                                  length - 3 - to_plain_buffer_length, 0, 1, &need_transpose, &matrix_stride);
 
 		auto &e = set<SPIRAccessChain>(ops[1], ops[0], type.storage, base, offsets.first, offsets.second);
 		if (chain)