From a729c15e9dce9f5116a38afc66329ab2ca4cea54 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 29 Oct 2024 13:59:28 +0800 Subject: preparation for clang format (#5422) * Clang-format excludes * Add .clang-format * Don't clang-format in external * Missing includes and forward declarations * Replace wonky include-once macro name * neaten include naming * Add clang-format to formatting script * Add xargs and diff to required binaries * add clang-format to ci formatting check * Add max version check to formatting script * temporarily disable checking formatting for cpp files --- examples/example-base/test-base.cpp | 7 +++++-- examples/hello-world/vulkan-api.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/example-base/test-base.cpp b/examples/example-base/test-base.cpp index 0e0f8a69c..9d8ec8ce6 100644 --- a/examples/example-base/test-base.cpp +++ b/examples/example-base/test-base.cpp @@ -1,8 +1,11 @@ #include "test-base.h" #ifdef _WIN32 -#include -#include +// clang-format off +// include ordering sensitive +# include +# include +// clang-format on #endif int TestBase::parseOption(int argc, char** argv) diff --git a/examples/hello-world/vulkan-api.h b/examples/hello-world/vulkan-api.h index 17d0465a6..89ca9747d 100644 --- a/examples/hello-world/vulkan-api.h +++ b/examples/hello-world/vulkan-api.h @@ -7,6 +7,7 @@ // the Vulkan API. // The Vulkan function pointers we will use in this example. +// clang-format off #define VK_API_GLOBAL_PROCS(x) \ x(vkGetInstanceProcAddr) \ x(vkCreateInstance) \ @@ -87,6 +88,7 @@ /* */ #define VK_API_DECLARE_PROC(NAME) PFN_##NAME NAME = nullptr; +// clang-format on struct VulkanAPI { -- cgit v1.2.3