Enable AlignAfterOpenBracket: BlockIndent formatting

.clang-format

@@ -1,7 +1,7 @@
 ---
 Language:        Cpp
 AccessModifierOffset: -4
-AlignAfterOpenBracket: AlwaysBreak
+AlignAfterOpenBracket: BlockIndent
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
 AlignConsecutiveBitFields: true

include/VulkanUtils.hpp

@@ -38,39 +38,45 @@ std::int32_t FindMemoryTypeIndex(
 	const vk::PhysicalDevice& PhysicalDevice, std::uint32_t MemoryTypeMask,
 	vk::MemoryPropertyFlags Properties,
 	vk::MemoryPropertyFlags ExcludeProperties
-	= vk::MemoryPropertyFlagBits::eProtected);
+	= vk::MemoryPropertyFlagBits::eProtected
+);
 
 // Allocations
 std::optional<vk::UniqueDeviceMemory> AllocateDeviceMemory(
 	vk::Device Device, std::size_t Size, std::uint32_t MemoryTypeIndex,
 	vk::Buffer DedicatedBuffer = vk::Buffer(),
-	vk::Image  DedicatedImage  = vk::Image());
+	vk::Image  DedicatedImage  = vk::Image()
+);
 
 std::optional<std::tuple<vk::UniqueBuffer, vk::UniqueDeviceMemory>>
 	AllocateBuffer(
 		vk::Device Device, vk::PhysicalDevice PhysicalDevice, std::size_t Size,
 		vk::BufferUsageFlags Usage, vk::MemoryPropertyFlags Properties,
 		vk::MemoryPropertyFlags ExcludeProperties
 		= vk::MemoryPropertyFlagBits::eProtected,
-		vk::SharingMode Sharing = vk::SharingMode::eExclusive);
+		vk::SharingMode Sharing = vk::SharingMode::eExclusive
+	);
 
 std::optional<std::tuple<vk::UniqueImage, vk::UniqueDeviceMemory>>
 	AllocateImage(
 		vk::Device Device, vk::PhysicalDevice PhysicalDevice,
 		vk::ImageCreateInfo NewImageInfo, vk::MemoryPropertyFlags Properties,
 		vk::MemoryPropertyFlags ExcludeProperties
-		= vk::MemoryPropertyFlagBits::eProtected);
+		= vk::MemoryPropertyFlagBits::eProtected
+	);
 
 std::optional<vk::UniqueShaderModule>
 	LoadShaderModule(const vk::Device& Device, std::span<const std::byte> Code);
 
 vk::MemoryHeap GetLargestPhysicalDeviceHeap(
 	const vk::PhysicalDevice& PhysicalDevice,
-	vk::MemoryHeapFlags       Flags = vk::MemoryHeapFlagBits::eDeviceLocal);
+	vk::MemoryHeapFlags       Flags = vk::MemoryHeapFlagBits::eDeviceLocal
+);
 
 // Debug callback
 VKAPI_ATTR VkBool32 VKAPI_CALL DebugMessageCallback(
 	VkDebugUtilsMessageSeverityFlagBitsEXT      MessageSeverity,
 	VkDebugUtilsMessageTypeFlagsEXT             MessageType,
-	const VkDebugUtilsMessengerCallbackDataEXT* CallbackData, void* UserData);
+	const VkDebugUtilsMessengerCallbackDataEXT* CallbackData, void* UserData
+);
 } // namespace VulkanUtils

include/Vulkanator.hpp

@@ -187,5 +187,6 @@ enum
 extern "C" {
 DllExport PF_Err EntryPoint(
 	PF_Cmd cmd, PF_InData* in_data, PF_OutData* out_data, PF_ParamDef* params[],
-	PF_LayerDef* output, void* extra);
+	PF_LayerDef* output, void* extra
+);
 }

shaders/Vulkanator.frag

@@ -20,14 +20,14 @@ void main()
 	FragColor = texture(InputTexture, InCoord).gbar;
 
 	// 16 bit colors have to be specially handled
-	if(RenderParams.Depth == DEPTH16) FragColor *= DEPTH16_LOAD_SCALE;
-
+	if( RenderParams.Depth == DEPTH16 )
+		FragColor *= DEPTH16_LOAD_SCALE;
 
 	FragColor *= RenderParams.ColorFactor;
 
-
 	// 16 bit colors have to be specially handled
-	if(RenderParams.Depth == DEPTH16) FragColor = mix((0.0).xxxx, DEPTH16_STORE_SCALE.xxxx, FragColor);
+	if( RenderParams.Depth == DEPTH16 )
+		FragColor = mix((0.0).xxxx, DEPTH16_STORE_SCALE.xxxx, FragColor);
 
 	// After effects stores things in ARGB order (/_\)
 	FragColor = FragColor.argb;

shaders/Vulkanator.glsl

@@ -1,6 +1,6 @@
 #extension GL_EXT_shader_explicit_arithmetic_types : require
 
-const uint32_t DEPTH08 =  8u / 16u;
+const uint32_t DEPTH08 = 8u / 16u;
 const uint32_t DEPTH16 = 16u / 16u;
 const uint32_t DEPTH32 = 32u / 16u;
 
@@ -13,6 +13,6 @@ const float32_t DEPTH16_STORE_SCALE = DEPTH16MAX / float(0x10000);
 struct VulkanatorRenderParams
 {
 	uint32_t Depth;
-	f32mat4 Transform;
-	f32vec4 ColorFactor;
+	f32mat4  Transform;
+	f32vec4  ColorFactor;
 };

shaders/Vulkanator.vert

@@ -15,9 +15,7 @@ layout(binding = 0) uniform Uniforms
 void main()
 {
 	gl_Position = f32vec4(
-		(RenderParams.Transform * f32vec4(InPosition, 0.0, 1.0)).xy,
-		0.0,
-		1.0
+		(RenderParams.Transform * f32vec4(InPosition, 0.0, 1.0)).xy, 0.0, 1.0
 	);
 	OutCoord = InCoord;
 }

source/VulkanUtils.cpp

@@ -11,7 +11,8 @@ namespace VulkanUtils
 std::int32_t FindMemoryTypeIndex(
 	const vk::PhysicalDevice& PhysicalDevice, std::uint32_t MemoryTypeMask,
 	vk::MemoryPropertyFlags Properties,
-	vk::MemoryPropertyFlags ExcludeProperties)
+	vk::MemoryPropertyFlags ExcludeProperties
+)
 {
 	const vk::PhysicalDeviceMemoryProperties DeviceMemoryProperties
 		= PhysicalDevice.getMemoryProperties();
@@ -38,7 +39,8 @@ std::int32_t FindMemoryTypeIndex(
 
 std::optional<vk::UniqueDeviceMemory> AllocateDeviceMemory(
 	vk::Device Device, std::size_t Size, std::uint32_t MemoryTypeIndex,
-	vk::Buffer DedicatedBuffer, vk::Image DedicatedImage)
+	vk::Buffer DedicatedBuffer, vk::Image DedicatedImage
+)
 {
 	vk::StructureChain<vk::MemoryAllocateInfo, vk::MemoryDedicatedAllocateInfo>
 		AllocSettings;
@@ -72,7 +74,8 @@ std::optional<std::tuple<vk::UniqueBuffer, vk::UniqueDeviceMemory>>
 	AllocateBuffer(
 		vk::Device Device, vk::PhysicalDevice PhysicalDevice, std::size_t Size,
 		vk::BufferUsageFlags Usage, vk::MemoryPropertyFlags Properties,
-		vk::MemoryPropertyFlags ExcludeProperties, vk::SharingMode Sharing)
+		vk::MemoryPropertyFlags ExcludeProperties, vk::SharingMode Sharing
+	)
 {
 	// Create the buffer object
 	vk::BufferCreateInfo NewBufferInfo = {};
@@ -99,15 +102,17 @@ std::optional<std::tuple<vk::UniqueBuffer, vk::UniqueDeviceMemory>>
 
 	const auto BufferMemoryIndex = FindMemoryTypeIndex(
 		PhysicalDevice, NewBufferRequirements.memoryTypeBits, Properties,
-		ExcludeProperties);
+		ExcludeProperties
+	);
 
 	if( BufferMemoryIndex < 0 )
 		return std::nullopt;
 
 	vk::UniqueDeviceMemory NewBufferDeviceMemory{};
 	if( auto NewDeviceMemory = AllocateDeviceMemory(
 			Device, NewBufferRequirements.size, BufferMemoryIndex,
-			NewBuffer.get(), vk::Image());
+			NewBuffer.get(), vk::Image()
+		);
 		NewDeviceMemory.has_value() )
 	{
 		NewBufferDeviceMemory = std::move(NewDeviceMemory.value());
@@ -118,22 +123,25 @@ std::optional<std::tuple<vk::UniqueBuffer, vk::UniqueDeviceMemory>>
 	}
 
 	if( auto BindResult = Device.bindBufferMemory(
-			NewBuffer.get(), NewBufferDeviceMemory.get(), 0);
+			NewBuffer.get(), NewBufferDeviceMemory.get(), 0
+		);
 		BindResult != vk::Result::eSuccess )
 	{
 		// Error binding buffer object to device memory
 		return std::nullopt;
 	}
 
 	return std::make_tuple(
-		std::move(NewBuffer), std::move(NewBufferDeviceMemory));
+		std::move(NewBuffer), std::move(NewBufferDeviceMemory)
+	);
 }
 
 std::optional<std::tuple<vk::UniqueImage, vk::UniqueDeviceMemory>>
 	AllocateImage(
 		vk::Device Device, vk::PhysicalDevice PhysicalDevice,
 		vk::ImageCreateInfo NewImageInfo, vk::MemoryPropertyFlags Properties,
-		vk::MemoryPropertyFlags ExcludeProperties)
+		vk::MemoryPropertyFlags ExcludeProperties
+	)
 {
 	vk::UniqueImage NewImage = {};
 
@@ -155,7 +163,8 @@ std::optional<std::tuple<vk::UniqueImage, vk::UniqueDeviceMemory>>
 
 	const auto ImageMemoryIndex = FindMemoryTypeIndex(
 		PhysicalDevice, NewImageRequirements.memoryTypeBits, Properties,
-		ExcludeProperties);
+		ExcludeProperties
+	);
 
 	if( ImageMemoryIndex < 0 )
 	{
@@ -166,7 +175,7 @@ std::optional<std::tuple<vk::UniqueImage, vk::UniqueDeviceMemory>>
 	if( auto NewDeviceMemory = AllocateDeviceMemory(
 			Device, NewImageRequirements.size, ImageMemoryIndex, vk::Buffer(),
 			NewImage.get() // ShouldDedicate ? NewImage.get() : vk::Image()
-			) )
+		) )
 	{
 		NewImageDeviceMemory = std::move(NewDeviceMemory.value());
 	}
@@ -183,7 +192,8 @@ std::optional<std::tuple<vk::UniqueImage, vk::UniqueDeviceMemory>>
 		return std::nullopt;
 	}
 	return std::make_tuple(
-		std::move(NewImage), std::move(NewImageDeviceMemory));
+		std::move(NewImage), std::move(NewImageDeviceMemory)
+	);
 }
 
 std::optional<vk::UniqueShaderModule>
@@ -216,7 +226,8 @@ std::optional<vk::UniqueShaderModule>
 }
 
 vk::MemoryHeap GetLargestPhysicalDeviceHeap(
-	const vk::PhysicalDevice& PhysicalDevice, vk::MemoryHeapFlags Flags)
+	const vk::PhysicalDevice& PhysicalDevice, vk::MemoryHeapFlags Flags
+)
 {
 	const vk::PhysicalDeviceMemoryProperties PhysicalDeviceMemoryProperties
 		= PhysicalDevice.getMemoryProperties();
@@ -244,7 +255,8 @@ vk::MemoryHeap GetLargestPhysicalDeviceHeap(
 VKAPI_ATTR VkBool32 VKAPI_CALL DebugMessageCallback(
 	VkDebugUtilsMessageSeverityFlagBitsEXT      MessageSeverity,
 	VkDebugUtilsMessageTypeFlagsEXT             MessageType,
-	const VkDebugUtilsMessengerCallbackDataEXT* CallbackData, void* UserData)
+	const VkDebugUtilsMessengerCallbackDataEXT* CallbackData, void* UserData
+)
 {
 	switch( vk::DebugUtilsMessageSeverityFlagBitsEXT(MessageSeverity) )
 	{