diff --git a/.github/linters/.clang-format b/.github/linters/.clang-format index 9fadeff..9b7998e 100644 --- a/.github/linters/.clang-format +++ b/.github/linters/.clang-format @@ -46,9 +46,6 @@ BraceWrapping: BeforeLambdaBody: true SplitEmptyFunction: false SplitEmptyRecord: false -#requires clang-format 22 -#BreakAfterOpenBracketFunction: true -#BreakBeforeCloseBracketFunction: true BreakBeforeBinaryOperators: All BreakBeforeTernaryOperators: false BreakConstructorInitializers: BeforeColon @@ -70,8 +67,6 @@ PointerAlignment: Left ReflowComments: true SortIncludes: false SpaceAfterCStyleCast: false -#requires clang format 21 -#SpaceAfterOperatorKeyword: true SpaceAfterTemplateKeyword: false SpaceBeforeAssignmentOperators: true SpaceBeforeCaseColon: false diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cf9444c..22fcc97 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -31,7 +31,7 @@ jobs: fetch-depth: 0 - name: Lint Code Base - uses: super-linter/super-linter@4ce20838b8ab83717e78138c5b3a1407148e0918 # v8.7.0 + uses: super-linter/super-linter@2da136927bd4a73596db63044b504547c62cb854 # v9.0.0 env: DEFAULT_BRANCH: origin/main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Inc/DirectXCollision.h b/Inc/DirectXCollision.h index cdaedc8..bd72a3c 100644 --- a/Inc/DirectXCollision.h +++ b/Inc/DirectXCollision.h @@ -188,9 +188,9 @@ namespace DirectX static void XM_CALLCONV CreateFromPoints(_Out_ BoundingBox& Out, _In_ FXMVECTOR pt1, _In_ FXMVECTOR pt2) noexcept; static void CreateFromPoints(_Out_ BoundingBox& Out, - _In_ size_t Count, - _In_reads_bytes_(sizeof(XMFLOAT3) + Stride * (Count - 1)) const XMFLOAT3* pPoints, - _In_ size_t Stride) noexcept; + _In_ size_t Count, + _In_reads_bytes_(sizeof(XMFLOAT3) + Stride * (Count - 1)) const XMFLOAT3* pPoints, + _In_ size_t Stride) noexcept; }; //------------------------------------------------------------------------------------- diff --git a/Inc/DirectXMath.h b/Inc/DirectXMath.h index 053f4f4..9c885a8 100644 --- a/Inc/DirectXMath.h +++ b/Inc/DirectXMath.h @@ -1783,9 +1783,9 @@ namespace DirectX XMVECTOR XM_CALLCONV XMVector2AngleBetweenVectors(FXMVECTOR V1, FXMVECTOR V2) noexcept; XMVECTOR XM_CALLCONV XMVector2LinePointDistance(FXMVECTOR LinePoint1, FXMVECTOR LinePoint2, FXMVECTOR Point) noexcept; XMVECTOR XM_CALLCONV XMVector2IntersectLine(FXMVECTOR Line1Point1, - FXMVECTOR Line1Point2, - FXMVECTOR Line2Point1, - GXMVECTOR Line2Point2) noexcept; + FXMVECTOR Line1Point2, + FXMVECTOR Line2Point1, + GXMVECTOR Line2Point2) noexcept; XMVECTOR XM_CALLCONV XMVector2Transform(FXMVECTOR V, FXMMATRIX M) noexcept; XMFLOAT4* XM_CALLCONV XMVector2TransformStream(_Out_writes_bytes_(sizeof(XMFLOAT4) + OutputStride * (VectorCount - 1)) XMFLOAT4* pOutputStream, @@ -1855,9 +1855,9 @@ namespace DirectX XMVECTOR XM_CALLCONV XMVector3AngleBetweenVectors(FXMVECTOR V1, FXMVECTOR V2) noexcept; XMVECTOR XM_CALLCONV XMVector3LinePointDistance(FXMVECTOR LinePoint1, FXMVECTOR LinePoint2, FXMVECTOR Point) noexcept; void XM_CALLCONV XMVector3ComponentsFromNormal(_Out_ XMVECTOR* pParallel, - _Out_ XMVECTOR* pPerpendicular, - _In_ FXMVECTOR V, - _In_ FXMVECTOR Normal) noexcept; + _Out_ XMVECTOR* pPerpendicular, + _In_ FXMVECTOR V, + _In_ FXMVECTOR Normal) noexcept; XMVECTOR XM_CALLCONV XMVector3Rotate(FXMVECTOR V, FXMVECTOR RotationQuaternion) noexcept; XMVECTOR XM_CALLCONV XMVector3InverseRotate(FXMVECTOR V, FXMVECTOR RotationQuaternion) noexcept; XMVECTOR XM_CALLCONV XMVector3Transform(FXMVECTOR V, FXMMATRIX M) noexcept; @@ -1885,15 +1885,15 @@ namespace DirectX _In_ size_t VectorCount, _In_ FXMMATRIX M) noexcept; XMVECTOR XM_CALLCONV XMVector3Project(FXMVECTOR V, - float ViewportX, - float ViewportY, - float ViewportWidth, - float ViewportHeight, - float ViewportMinZ, - float ViewportMaxZ, - FXMMATRIX Projection, - CXMMATRIX View, - CXMMATRIX World) noexcept; + float ViewportX, + float ViewportY, + float ViewportWidth, + float ViewportHeight, + float ViewportMinZ, + float ViewportMaxZ, + FXMMATRIX Projection, + CXMMATRIX View, + CXMMATRIX World) noexcept; XMFLOAT3* XM_CALLCONV XMVector3ProjectStream(_Out_writes_bytes_(sizeof(XMFLOAT3) + OutputStride * (VectorCount - 1)) XMFLOAT3* pOutputStream, _In_ size_t OutputStride, @@ -1910,15 +1910,15 @@ namespace DirectX _In_ CXMMATRIX View, _In_ CXMMATRIX World) noexcept; XMVECTOR XM_CALLCONV XMVector3Unproject(FXMVECTOR V, - float ViewportX, - float ViewportY, - float ViewportWidth, - float ViewportHeight, - float ViewportMinZ, - float ViewportMaxZ, - FXMMATRIX Projection, - CXMMATRIX View, - CXMMATRIX World) noexcept; + float ViewportX, + float ViewportY, + float ViewportWidth, + float ViewportHeight, + float ViewportMinZ, + float ViewportMaxZ, + FXMMATRIX Projection, + CXMMATRIX View, + CXMMATRIX World) noexcept; XMFLOAT3* XM_CALLCONV XMVector3UnprojectStream(_Out_writes_bytes_(sizeof(XMFLOAT3) + OutputStride * (VectorCount - 1)) XMFLOAT3* pOutputStream, _In_ size_t OutputStride, @@ -2111,12 +2111,12 @@ namespace DirectX XMVECTOR XM_CALLCONV XMQuaternionSquad(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, GXMVECTOR Q3, float t) noexcept; XMVECTOR XM_CALLCONV XMQuaternionSquadV(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, GXMVECTOR Q3, HXMVECTOR T) noexcept; void XM_CALLCONV XMQuaternionSquadSetup(_Out_ XMVECTOR* pA, - _Out_ XMVECTOR* pB, - _Out_ XMVECTOR* pC, - _In_ FXMVECTOR Q0, - _In_ FXMVECTOR Q1, - _In_ FXMVECTOR Q2, - _In_ GXMVECTOR Q3) noexcept; + _Out_ XMVECTOR* pB, + _Out_ XMVECTOR* pC, + _In_ FXMVECTOR Q0, + _In_ FXMVECTOR Q1, + _In_ FXMVECTOR Q2, + _In_ GXMVECTOR Q3) noexcept; XMVECTOR XM_CALLCONV XMQuaternionBaryCentric(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, float f, float g) noexcept; XMVECTOR XM_CALLCONV XMQuaternionBaryCentricV(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, GXMVECTOR F, HXMVECTOR G) noexcept; @@ -2154,9 +2154,9 @@ namespace DirectX XMVECTOR XM_CALLCONV XMPlaneNormalize(FXMVECTOR P) noexcept; XMVECTOR XM_CALLCONV XMPlaneIntersectLine(FXMVECTOR P, FXMVECTOR LinePoint1, FXMVECTOR LinePoint2) noexcept; void XM_CALLCONV XMPlaneIntersectPlane(_Out_ XMVECTOR* pLinePoint1, - _Out_ XMVECTOR* pLinePoint2, - _In_ FXMVECTOR P1, - _In_ FXMVECTOR P2) noexcept; + _Out_ XMVECTOR* pLinePoint2, + _In_ FXMVECTOR P1, + _In_ FXMVECTOR P2) noexcept; // Transforms a plane given an inverse transpose matrix XMVECTOR XM_CALLCONV XMPlaneTransform(FXMVECTOR P, FXMMATRIX ITM) noexcept; diff --git a/Inc/DirectXMathMisc.inl b/Inc/DirectXMathMisc.inl index 01378ec..5e84aed 100644 --- a/Inc/DirectXMathMisc.inl +++ b/Inc/DirectXMathMisc.inl @@ -1244,8 +1244,8 @@ inline XMVECTOR XM_CALLCONV XMColorAdjustSaturation(FXMVECTOR vColor, float fSat const XMVECTORF32 gvLuminance = { { { 0.2125f, 0.7154f, 0.0721f, 0.0f } } }; #if defined(_XM_NO_INTRINSICS_) - float fLuminance = (vColor.vector4_f32[0] * gvLuminance.f[0]) + (vColor.vector4_f32[1] * gvLuminance.f[1]) - + (vColor.vector4_f32[2] * gvLuminance.f[2]); + float fLuminance = (vColor.vector4_f32[0] * gvLuminance.f[0]) + (vColor.vector4_f32[1] * gvLuminance.f[1]) + + (vColor.vector4_f32[2] * gvLuminance.f[2]); XMVECTOR vResult; vResult.vector4_f32[0] = ((vColor.vector4_f32[0] - fLuminance) * fSaturation) + fLuminance; vResult.vector4_f32[1] = ((vColor.vector4_f32[1] - fLuminance) * fSaturation) + fLuminance; diff --git a/Inc/DirectXPackedVector.h b/Inc/DirectXPackedVector.h index 764bd49..dd10296 100644 --- a/Inc/DirectXPackedVector.h +++ b/Inc/DirectXPackedVector.h @@ -1424,10 +1424,10 @@ namespace DirectX _In_ size_t HalfCount) noexcept; HALF XMConvertFloatToHalf(float Value) noexcept; HALF* XMConvertFloatToHalfStream(_Out_writes_bytes_(sizeof(HALF) + OutputStride * (FloatCount - 1)) HALF* pOutputStream, - _In_ size_t OutputStride, - _In_reads_bytes_(sizeof(float) + InputStride * (FloatCount - 1)) const float* pInputStream, - _In_ size_t InputStride, - _In_ size_t FloatCount) noexcept; + _In_ size_t OutputStride, + _In_reads_bytes_(sizeof(float) + InputStride * (FloatCount - 1)) const float* pInputStream, + _In_ size_t InputStride, + _In_ size_t FloatCount) noexcept; /**************************************************************************** * diff --git a/README.md b/README.md index 2e3d1d1..ac2befe 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ For a full change history, see [CHANGELOG.md](https://github.com/microsoft/Direc * clang-format use for this project must match the version use by GitHub Super-Linter to pass the validation. VS 2022 and VS 2026 come with different versions, so to match use: ```cmd -winget install --id=LLVM.LLVM --version 21.1.2 +winget install --id=LLVM.LLVM --version 22.1.3 powershell -File build/Format.ps1 -LLVM ``` diff --git a/SHMath/DirectXSH.cpp b/SHMath/DirectXSH.cpp index 47a6c4c..c457ba5 100644 --- a/SHMath/DirectXSH.cpp +++ b/SHMath/DirectXSH.cpp @@ -1108,7 +1108,7 @@ _Use_decl_annotations_ float* XM_CALLCONV DirectX::XMSHRotate(float* result, siz { const unsigned int uBase = iR * 5; result[4 + iR] = R[uBase + 0] * input[4] + R[uBase + 1] * input[5] + R[uBase + 2] * input[6] + R[uBase + 3] * input[7] - + R[uBase + 4] * input[8]; + + R[uBase + 4] * input[8]; } } break; diff --git a/XDSP/XDSP.h b/XDSP/XDSP.h index 6ff6cf1..bd56986 100644 --- a/XDSP/XDSP.h +++ b/XDSP/XDSP.h @@ -328,9 +328,9 @@ namespace XDSP assert(ISPOWEROF2(uCount)); static const XMVECTORF32 aUnityTableReal[4] = { { { { 1.0f, 1.0f, 1.0f, 1.0f } } }, - { { { 1.0f, 0.92387950f, 0.70710677f, 0.38268343f } } }, - { { { 1.0f, 0.70710677f, -4.3711388e-008f, -0.70710677f } } }, - { { { 1.0f, 0.38268343f, -0.70710677f, -0.92387950f } } } }; + { { { 1.0f, 0.92387950f, 0.70710677f, 0.38268343f } } }, + { { { 1.0f, 0.70710677f, -4.3711388e-008f, -0.70710677f } } }, + { { { 1.0f, 0.38268343f, -0.70710677f, -0.92387950f } } } }; static const XMVECTORF32 aUnityTableImaginary[4] = { { { { -0.0f, -0.0f, -0.0f, -0.0f } } }, { { { -0.0f, -0.38268343f, -0.70710677f, -0.92387950f } } }, { { { -0.0f, -0.70710677f, -1.0f, -0.70710677f } } }, diff --git a/build/Format.ps1 b/build/Format.ps1 index f43730a..765c7c9 100644 --- a/build/Format.ps1 +++ b/build/Format.ps1 @@ -13,7 +13,7 @@ This is use to clang-format the code using the rules in .github\linters\.clang-f The clang-format version must match the version used by GitHub Super-Linter or false positives can be found. You can install this version locally using: -winget install --id=LLVM.LLVM --version 21.1.2 +winget install --id=LLVM.LLVM --version 22.1.3 .PARAMETER Check Runs clang-format without modifying the files in place. @@ -58,7 +58,7 @@ if (-not $clangFormatPath -or -not (Test-Path -LiteralPath $clangFormatPath -Pat } # This has to match the version used by GitHub super-linter or results will not match. -$requiredClangFormatVersion = '21.1.2' +$requiredClangFormatVersion = '22.1.3' $clangFormatVersion = (& $clangFormatPath '--version' 2>&1 | Out-String).Trim() if ($LASTEXITCODE -ne 0) { throw "Unable to determine clang-format version."