clang-format: the very last piece of the puzzle (#1555)

Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Aug 23, 2022 · 5be7c6b · 5be7c6b
1 parent 9f8e92c
commit 5be7c6b
Show file tree

Hide file tree

Showing 6 changed files with 2,384 additions and 2,143 deletions.
diff --git a/src/cmake/compiler.cmake b/src/cmake/compiler.cmake
@@ -475,7 +475,7 @@ endif ()
 # is being built as a subproject.
 if (PROJECT_IS_TOP_LEVEL)
     set (CLANG_FORMAT_EXE_HINT "" CACHE PATH "clang-format executable's directory (will search if not specified")
-    set (CLANG_FORMAT_INCLUDES  # "src/*.cpp"
+    set (CLANG_FORMAT_INCLUDES  "src/*.cpp"
                                 "src/*.h"
                                 "src/*.cu"
                                 "src/include/*.h"

diff --git a/src/liboslexec/backendllvm.cpp b/src/liboslexec/backendllvm.cpp
@@ -560,8 +560,7 @@ BackendLLVM::llvm_load_value(llvm::Value* ptr, const TypeSpec& type, int deriv,
     // also to avoid ugliness with function signatures differing between CPU
     // and GPU. Maybe some day we'll use the hash representation on both
     // sides?
-    if (type.is_string()
-        && ll.ustring_rep() != LLVM_Util::UstringRep::charptr)
+    if (type.is_string() && ll.ustring_rep() != LLVM_Util::UstringRep::charptr)
         result = ll.int_to_ptr_cast(result);
 
     return result;

diff --git a/src/liboslexec/closure.cpp b/src/liboslexec/closure.cpp
@@ -8,9 +8,10 @@
 
 #include <OpenImageIO/sysutil.h>
 
-#include <OSL/oslconfig.h>
-#include <OSL/oslclosure.h>
 #include <OSL/genclosure.h>
+#include <OSL/oslclosure.h>
+#include <OSL/oslconfig.h>
+
 #include "oslexec_pvt.h"
 
 

diff --git a/src/liboslexec/llvm_ops.cpp b/src/liboslexec/llvm_ops.cpp
@@ -501,6 +501,7 @@ osl_sincos_dvdvdv(void* x_, void* s_, void* c_)
 #endif
 }
 
+// clang-format off
 #if OSL_FAST_MATH
 MAKE_UNARY_PERCOMPONENT_OP     (log        , OIIO::fast_log       , fast_log)
 MAKE_UNARY_PERCOMPONENT_OP     (log2       , OIIO::fast_log2      , fast_log2)
@@ -529,6 +530,8 @@ MAKE_UNARY_PERCOMPONENT_OP     (cbrt       , cbrtf                , cbrt)
 
 MAKE_UNARY_PERCOMPONENT_OP     (sqrt       , OIIO::safe_sqrt      , sqrt)
 MAKE_UNARY_PERCOMPONENT_OP     (inversesqrt, OIIO::safe_inversesqrt, inversesqrt)
+// clang-format on
+
 
 OSL_SHADEOP float
 osl_logb_ff(float x)