Add option AlignConsecutiveMacros: Consecutive

asuessenbach · asuessenbach · commit 42ce94fc1079 · 2026-03-23T17:33:22.000+01:00
diff --git a/.clang-format b/.clang-format
@@ -5,6 +5,7 @@ AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
+AlignConsecutiveMacros: Consecutive
 AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: true
diff --git a/framework/scene_graph/components/image/astc.cpp b/framework/scene_graph/components/image/astc.cpp
@@ -32,7 +32,7 @@
 
 #include <filesystem/filesystem.hpp>
 
-#define MAGIC_FILE_CONSTANT 0x5CA1AB13
+#define MAGIC_FILE_CONSTANT  0x5CA1AB13
 #define ASTC_CACHE_DIRECTORY "cache/astc_to_bin"
 
 constexpr uint32_t ASTC_CACHE_HEADER_SIZE = 64;
diff --git a/samples/extensions/conservative_rasterization/conservative_rasterization.cpp b/samples/extensions/conservative_rasterization/conservative_rasterization.cpp
@@ -26,7 +26,7 @@
 #include "conservative_rasterization.h"
 
 #define FB_COLOR_FORMAT VK_FORMAT_R8G8B8A8_UNORM
-#define ZOOM_FACTOR 16
+#define ZOOM_FACTOR     16
 
 ConservativeRasterization::ConservativeRasterization()
 {
diff --git a/samples/extensions/conservative_rasterization/conservative_rasterization.h b/samples/extensions/conservative_rasterization/conservative_rasterization.h
@@ -28,7 +28,7 @@
 #include "api_vulkan_sample.h"
 
 #define FB_COLOR_FORMAT VK_FORMAT_R8G8B8A8_UNORM
-#define ZOOM_FACTOR 16
+#define ZOOM_FACTOR     16
 
 class ConservativeRasterization : public ApiVulkanSample
 {
diff --git a/samples/extensions/memory_budget/memory_budget.h b/samples/extensions/memory_budget/memory_budget.h
@@ -25,7 +25,7 @@
 
 #include "api_vulkan_sample.h"
 
-#define MESH_DENSITY 2048
+#define MESH_DENSITY      2048
 #define MESH_DENSITY_HALF 1024
 
 class MemoryBudget : public ApiVulkanSample
diff --git a/samples/extensions/open_cl_common/open_cl_utils.cpp b/samples/extensions/open_cl_common/open_cl_utils.cpp
@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#define OPENCL_EXPORTED_FUNCTION(func_name) std::function<decltype(func_name)> func_name##_ptr = nullptr
+#define OPENCL_EXPORTED_FUNCTION(func_name)           std::function<decltype(func_name)> func_name##_ptr = nullptr
 #define OPENCL_EXPORTED_EXTENSION_FUNCTION(func_name) std::function<decltype(func_name)> func_name##_ptr = nullptr
 #include "open_cl_functions.inl"
 
diff --git a/samples/extensions/open_cl_common/open_cl_utils.h b/samples/extensions/open_cl_common/open_cl_utils.h
@@ -24,7 +24,7 @@
 #include <CL/opencl.h>
 #include <functional>
 
-#define OPENCL_EXPORTED_FUNCTION(func_name) extern std::function<decltype(func_name)> func_name##_ptr
+#define OPENCL_EXPORTED_FUNCTION(func_name)           extern std::function<decltype(func_name)> func_name##_ptr
 #define OPENCL_EXPORTED_EXTENSION_FUNCTION(func_name) extern std::function<decltype(func_name)> func_name##_ptr
 #include "open_cl_functions.inl"
 #undef OPENCL_EXPORTED_FUNCTION
@@ -35,30 +35,30 @@ void           unload_opencl();
 
 #ifdef CL_FUNCTION_DEFINITIONS
 
-#	define clCreateContext clCreateContext_ptr
-#	define clGetDeviceIDs clGetDeviceIDs_ptr
-#	define clGetPlatformIDs clGetPlatformIDs_ptr
-#	define clCreateBuffer clCreateBuffer_ptr
-#	define clReleaseMemObject clReleaseMemObject_ptr
-#	define clCreateProgramWithSource clCreateProgramWithSource_ptr
-#	define clBuildProgram clBuildProgram_ptr
-#	define clCreateKernel clCreateKernel_ptr
-#	define clSetKernelArg clSetKernelArg_ptr
-#	define clEnqueueNDRangeKernel clEnqueueNDRangeKernel_ptr
-#	define clFlush clFlush_ptr
-#	define clFinish clFinish_ptr
-#	define clCreateCommandQueue clCreateCommandQueue_ptr
-#	define clReleaseContext clReleaseContext_ptr
-#	define clGetPlatformInfo clGetPlatformInfo_ptr
+#	define clCreateContext                          clCreateContext_ptr
+#	define clGetDeviceIDs                           clGetDeviceIDs_ptr
+#	define clGetPlatformIDs                         clGetPlatformIDs_ptr
+#	define clCreateBuffer                           clCreateBuffer_ptr
+#	define clReleaseMemObject                       clReleaseMemObject_ptr
+#	define clCreateProgramWithSource                clCreateProgramWithSource_ptr
+#	define clBuildProgram                           clBuildProgram_ptr
+#	define clCreateKernel                           clCreateKernel_ptr
+#	define clSetKernelArg                           clSetKernelArg_ptr
+#	define clEnqueueNDRangeKernel                   clEnqueueNDRangeKernel_ptr
+#	define clFlush                                  clFlush_ptr
+#	define clFinish                                 clFinish_ptr
+#	define clCreateCommandQueue                     clCreateCommandQueue_ptr
+#	define clReleaseContext                         clReleaseContext_ptr
+#	define clGetPlatformInfo                        clGetPlatformInfo_ptr
 #	define clGetExtensionFunctionAddressForPlatform clGetExtensionFunctionAddressForPlatform_ptr
-#	define clImportMemoryARM clImportMemoryARM_ptr
-#	define clCreateImageWithProperties clCreateImageWithProperties_ptr
-#	define clEnqueueWaitSemaphoresKHR clEnqueueWaitSemaphoresKHR_ptr
-#	define clEnqueueSignalSemaphoresKHR clEnqueueSignalSemaphoresKHR_ptr
-#	define clEnqueueAcquireExternalMemObjectsKHR clEnqueueAcquireExternalMemObjectsKHR_ptr
-#	define clEnqueueReleaseExternalMemObjectsKHR clEnqueueReleaseExternalMemObjectsKHR_ptr
-#	define clCreateSemaphoreWithPropertiesKHR clCreateSemaphoreWithPropertiesKHR_ptr
-#	define clReleaseSemaphoreKHR clReleaseSemaphoreKHR_ptr
-#	define clGetDeviceInfo clGetDeviceInfo_ptr
+#	define clImportMemoryARM                        clImportMemoryARM_ptr
+#	define clCreateImageWithProperties              clCreateImageWithProperties_ptr
+#	define clEnqueueWaitSemaphoresKHR               clEnqueueWaitSemaphoresKHR_ptr
+#	define clEnqueueSignalSemaphoresKHR             clEnqueueSignalSemaphoresKHR_ptr
+#	define clEnqueueAcquireExternalMemObjectsKHR    clEnqueueAcquireExternalMemObjectsKHR_ptr
+#	define clEnqueueReleaseExternalMemObjectsKHR    clEnqueueReleaseExternalMemObjectsKHR_ptr
+#	define clCreateSemaphoreWithPropertiesKHR       clCreateSemaphoreWithPropertiesKHR_ptr
+#	define clReleaseSemaphoreKHR                    clReleaseSemaphoreKHR_ptr
+#	define clGetDeviceInfo                          clGetDeviceInfo_ptr
 
 #endif
diff --git a/samples/extensions/open_gl_interop/offscreen_context.h b/samples/extensions/open_gl_interop/offscreen_context.h
@@ -28,19 +28,19 @@ constexpr uint32_t SHARED_TEXTURE_DIMENSION = 512;
 #ifdef WIN32
 constexpr const char *HOST_MEMORY_EXTENSION_NAME    = VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME;
 constexpr const char *HOST_SEMAPHORE_EXTENSION_NAME = VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME;
-#	define glImportSemaphore glImportSemaphoreWin32HandleEXT
-#	define glImportMemory glImportMemoryWin32HandleEXT
-#	define GL_HANDLE_TYPE GL_HANDLE_TYPE_OPAQUE_WIN32_EXT
+#	define glImportSemaphore                 glImportSemaphoreWin32HandleEXT
+#	define glImportMemory                    glImportMemoryWin32HandleEXT
+#	define GL_HANDLE_TYPE                    GL_HANDLE_TYPE_OPAQUE_WIN32_EXT
 #	define VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT
-#	define VK_EXTERNAL_MEMORY_HANDLE_TYPE VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
+#	define VK_EXTERNAL_MEMORY_HANDLE_TYPE    VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
 #else
 constexpr const char *HOST_MEMORY_EXTENSION_NAME    = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME;
 constexpr const char *HOST_SEMAPHORE_EXTENSION_NAME = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME;
-#	define glImportSemaphore glImportSemaphoreFdEXT
-#	define glImportMemory glImportMemoryFdEXT
-#	define GL_HANDLE_TYPE GL_HANDLE_TYPE_OPAQUE_FD_EXT
+#	define glImportSemaphore                 glImportSemaphoreFdEXT
+#	define glImportMemory                    glImportMemoryFdEXT
+#	define GL_HANDLE_TYPE                    GL_HANDLE_TYPE_OPAQUE_FD_EXT
 #	define VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT
-#	define VK_EXTERNAL_MEMORY_HANDLE_TYPE VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT
+#	define VK_EXTERNAL_MEMORY_HANDLE_TYPE    VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT
 #endif
 
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
diff --git a/samples/extensions/open_gl_interop/third_party/glad/include/glad/glad.h b/samples/extensions/open_gl_interop/third_party/glad/include/glad/glad.h
diff --git a/samples/general/mobile_nerf/mobile_nerf.h b/samples/general/mobile_nerf/mobile_nerf.h
diff --git a/samples/general/mobile_nerf_rayquery/mobile_nerf_rayquery.h b/samples/general/mobile_nerf_rayquery/mobile_nerf_rayquery.h

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`#include "conservative_rasterization.h"`
`27`	`27`
`28`	`28`	`#define FB_COLOR_FORMAT VK_FORMAT_R8G8B8A8_UNORM`
`29`		`-#define ZOOM_FACTOR 16`
	`29`	`+#define ZOOM_FACTOR 16`
`30`	`30`
`31`	`31`	`ConservativeRasterization::ConservativeRasterization()`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#include "api_vulkan_sample.h"`
`29`	`29`
`30`	`30`	`#define FB_COLOR_FORMAT VK_FORMAT_R8G8B8A8_UNORM`
`31`		`-#define ZOOM_FACTOR 16`
	`31`	`+#define ZOOM_FACTOR 16`
`32`	`32`
`33`	`33`	`class ConservativeRasterization : public ApiVulkanSample`
`34`	`34`	`{`