Skip to content

Commit ee612d3

Browse files
dependabot[bot]dependabot[bot]
authored
Bump super-linter/super-linter from 8.7.0 to 9.0.0 (#359)
1 parent e40e02f commit ee612d3

10 files changed

Lines changed: 50 additions & 55 deletions

File tree

‎.github/linters/.clang-format‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ BraceWrapping:
4646
BeforeLambdaBody: true
4747
SplitEmptyFunction: false
4848
SplitEmptyRecord: false
49-
#requires clang-format 22
50-
#BreakAfterOpenBracketFunction: true
51-
#BreakBeforeCloseBracketFunction: true
5249
BreakBeforeBinaryOperators: All
5350
BreakBeforeTernaryOperators: false
5451
BreakConstructorInitializers: BeforeColon
@@ -70,8 +67,6 @@ PointerAlignment: Left
7067
ReflowComments: true
7168
SortIncludes: false
7269
SpaceAfterCStyleCast: false
73-
#requires clang format 21
74-
#SpaceAfterOperatorKeyword: true
7570
SpaceAfterTemplateKeyword: false
7671
SpaceBeforeAssignmentOperators: true
7772
SpaceBeforeCaseColon: false

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 0
3232

3333
- name: Lint Code Base
34-
uses: super-linter/super-linter@4ce20838b8ab83717e78138c5b3a1407148e0918 # v8.7.0
34+
uses: super-linter/super-linter@2da136927bd4a73596db63044b504547c62cb854 # v9.0.0
3535
env:
3636
DEFAULT_BRANCH: origin/main
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎Inc/DirectXCollision.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ namespace DirectX
188188

189189
static void XM_CALLCONV CreateFromPoints(_Out_ BoundingBox& Out, _In_ FXMVECTOR pt1, _In_ FXMVECTOR pt2) noexcept;
190190
static void CreateFromPoints(_Out_ BoundingBox& Out,
191-
_In_ size_t Count,
192-
_In_reads_bytes_(sizeof(XMFLOAT3) + Stride * (Count - 1)) const XMFLOAT3* pPoints,
193-
_In_ size_t Stride) noexcept;
191+
_In_ size_t Count,
192+
_In_reads_bytes_(sizeof(XMFLOAT3) + Stride * (Count - 1)) const XMFLOAT3* pPoints,
193+
_In_ size_t Stride) noexcept;
194194
};
195195

196196
//-------------------------------------------------------------------------------------

‎Inc/DirectXMath.h‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,9 +1783,9 @@ namespace DirectX
17831783
XMVECTOR XM_CALLCONV XMVector2AngleBetweenVectors(FXMVECTOR V1, FXMVECTOR V2) noexcept;
17841784
XMVECTOR XM_CALLCONV XMVector2LinePointDistance(FXMVECTOR LinePoint1, FXMVECTOR LinePoint2, FXMVECTOR Point) noexcept;
17851785
XMVECTOR XM_CALLCONV XMVector2IntersectLine(FXMVECTOR Line1Point1,
1786-
FXMVECTOR Line1Point2,
1787-
FXMVECTOR Line2Point1,
1788-
GXMVECTOR Line2Point2) noexcept;
1786+
FXMVECTOR Line1Point2,
1787+
FXMVECTOR Line2Point1,
1788+
GXMVECTOR Line2Point2) noexcept;
17891789
XMVECTOR XM_CALLCONV XMVector2Transform(FXMVECTOR V, FXMMATRIX M) noexcept;
17901790
XMFLOAT4* XM_CALLCONV XMVector2TransformStream(_Out_writes_bytes_(sizeof(XMFLOAT4) + OutputStride * (VectorCount - 1))
17911791
XMFLOAT4* pOutputStream,
@@ -1855,9 +1855,9 @@ namespace DirectX
18551855
XMVECTOR XM_CALLCONV XMVector3AngleBetweenVectors(FXMVECTOR V1, FXMVECTOR V2) noexcept;
18561856
XMVECTOR XM_CALLCONV XMVector3LinePointDistance(FXMVECTOR LinePoint1, FXMVECTOR LinePoint2, FXMVECTOR Point) noexcept;
18571857
void XM_CALLCONV XMVector3ComponentsFromNormal(_Out_ XMVECTOR* pParallel,
1858-
_Out_ XMVECTOR* pPerpendicular,
1859-
_In_ FXMVECTOR V,
1860-
_In_ FXMVECTOR Normal) noexcept;
1858+
_Out_ XMVECTOR* pPerpendicular,
1859+
_In_ FXMVECTOR V,
1860+
_In_ FXMVECTOR Normal) noexcept;
18611861
XMVECTOR XM_CALLCONV XMVector3Rotate(FXMVECTOR V, FXMVECTOR RotationQuaternion) noexcept;
18621862
XMVECTOR XM_CALLCONV XMVector3InverseRotate(FXMVECTOR V, FXMVECTOR RotationQuaternion) noexcept;
18631863
XMVECTOR XM_CALLCONV XMVector3Transform(FXMVECTOR V, FXMMATRIX M) noexcept;
@@ -1885,15 +1885,15 @@ namespace DirectX
18851885
_In_ size_t VectorCount,
18861886
_In_ FXMMATRIX M) noexcept;
18871887
XMVECTOR XM_CALLCONV XMVector3Project(FXMVECTOR V,
1888-
float ViewportX,
1889-
float ViewportY,
1890-
float ViewportWidth,
1891-
float ViewportHeight,
1892-
float ViewportMinZ,
1893-
float ViewportMaxZ,
1894-
FXMMATRIX Projection,
1895-
CXMMATRIX View,
1896-
CXMMATRIX World) noexcept;
1888+
float ViewportX,
1889+
float ViewportY,
1890+
float ViewportWidth,
1891+
float ViewportHeight,
1892+
float ViewportMinZ,
1893+
float ViewportMaxZ,
1894+
FXMMATRIX Projection,
1895+
CXMMATRIX View,
1896+
CXMMATRIX World) noexcept;
18971897
XMFLOAT3* XM_CALLCONV XMVector3ProjectStream(_Out_writes_bytes_(sizeof(XMFLOAT3) + OutputStride * (VectorCount - 1))
18981898
XMFLOAT3* pOutputStream,
18991899
_In_ size_t OutputStride,
@@ -1910,15 +1910,15 @@ namespace DirectX
19101910
_In_ CXMMATRIX View,
19111911
_In_ CXMMATRIX World) noexcept;
19121912
XMVECTOR XM_CALLCONV XMVector3Unproject(FXMVECTOR V,
1913-
float ViewportX,
1914-
float ViewportY,
1915-
float ViewportWidth,
1916-
float ViewportHeight,
1917-
float ViewportMinZ,
1918-
float ViewportMaxZ,
1919-
FXMMATRIX Projection,
1920-
CXMMATRIX View,
1921-
CXMMATRIX World) noexcept;
1913+
float ViewportX,
1914+
float ViewportY,
1915+
float ViewportWidth,
1916+
float ViewportHeight,
1917+
float ViewportMinZ,
1918+
float ViewportMaxZ,
1919+
FXMMATRIX Projection,
1920+
CXMMATRIX View,
1921+
CXMMATRIX World) noexcept;
19221922
XMFLOAT3* XM_CALLCONV XMVector3UnprojectStream(_Out_writes_bytes_(sizeof(XMFLOAT3) + OutputStride * (VectorCount - 1))
19231923
XMFLOAT3* pOutputStream,
19241924
_In_ size_t OutputStride,
@@ -2111,12 +2111,12 @@ namespace DirectX
21112111
XMVECTOR XM_CALLCONV XMQuaternionSquad(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, GXMVECTOR Q3, float t) noexcept;
21122112
XMVECTOR XM_CALLCONV XMQuaternionSquadV(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, GXMVECTOR Q3, HXMVECTOR T) noexcept;
21132113
void XM_CALLCONV XMQuaternionSquadSetup(_Out_ XMVECTOR* pA,
2114-
_Out_ XMVECTOR* pB,
2115-
_Out_ XMVECTOR* pC,
2116-
_In_ FXMVECTOR Q0,
2117-
_In_ FXMVECTOR Q1,
2118-
_In_ FXMVECTOR Q2,
2119-
_In_ GXMVECTOR Q3) noexcept;
2114+
_Out_ XMVECTOR* pB,
2115+
_Out_ XMVECTOR* pC,
2116+
_In_ FXMVECTOR Q0,
2117+
_In_ FXMVECTOR Q1,
2118+
_In_ FXMVECTOR Q2,
2119+
_In_ GXMVECTOR Q3) noexcept;
21202120
XMVECTOR XM_CALLCONV XMQuaternionBaryCentric(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, float f, float g) noexcept;
21212121
XMVECTOR XM_CALLCONV XMQuaternionBaryCentricV(FXMVECTOR Q0, FXMVECTOR Q1, FXMVECTOR Q2, GXMVECTOR F, HXMVECTOR G) noexcept;
21222122

@@ -2154,9 +2154,9 @@ namespace DirectX
21542154
XMVECTOR XM_CALLCONV XMPlaneNormalize(FXMVECTOR P) noexcept;
21552155
XMVECTOR XM_CALLCONV XMPlaneIntersectLine(FXMVECTOR P, FXMVECTOR LinePoint1, FXMVECTOR LinePoint2) noexcept;
21562156
void XM_CALLCONV XMPlaneIntersectPlane(_Out_ XMVECTOR* pLinePoint1,
2157-
_Out_ XMVECTOR* pLinePoint2,
2158-
_In_ FXMVECTOR P1,
2159-
_In_ FXMVECTOR P2) noexcept;
2157+
_Out_ XMVECTOR* pLinePoint2,
2158+
_In_ FXMVECTOR P1,
2159+
_In_ FXMVECTOR P2) noexcept;
21602160

21612161
// Transforms a plane given an inverse transpose matrix
21622162
XMVECTOR XM_CALLCONV XMPlaneTransform(FXMVECTOR P, FXMMATRIX ITM) noexcept;

‎Inc/DirectXMathMisc.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,8 +1244,8 @@ inline XMVECTOR XM_CALLCONV XMColorAdjustSaturation(FXMVECTOR vColor, float fSat
12441244

12451245
const XMVECTORF32 gvLuminance = { { { 0.2125f, 0.7154f, 0.0721f, 0.0f } } };
12461246
#if defined(_XM_NO_INTRINSICS_)
1247-
float fLuminance = (vColor.vector4_f32[0] * gvLuminance.f[0]) + (vColor.vector4_f32[1] * gvLuminance.f[1])
1248-
+ (vColor.vector4_f32[2] * gvLuminance.f[2]);
1247+
float fLuminance = (vColor.vector4_f32[0] * gvLuminance.f[0]) + (vColor.vector4_f32[1] * gvLuminance.f[1])
1248+
+ (vColor.vector4_f32[2] * gvLuminance.f[2]);
12491249
XMVECTOR vResult;
12501250
vResult.vector4_f32[0] = ((vColor.vector4_f32[0] - fLuminance) * fSaturation) + fLuminance;
12511251
vResult.vector4_f32[1] = ((vColor.vector4_f32[1] - fLuminance) * fSaturation) + fLuminance;

‎Inc/DirectXPackedVector.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,10 +1424,10 @@ namespace DirectX
14241424
_In_ size_t HalfCount) noexcept;
14251425
HALF XMConvertFloatToHalf(float Value) noexcept;
14261426
HALF* XMConvertFloatToHalfStream(_Out_writes_bytes_(sizeof(HALF) + OutputStride * (FloatCount - 1)) HALF* pOutputStream,
1427-
_In_ size_t OutputStride,
1428-
_In_reads_bytes_(sizeof(float) + InputStride * (FloatCount - 1)) const float* pInputStream,
1429-
_In_ size_t InputStride,
1430-
_In_ size_t FloatCount) noexcept;
1427+
_In_ size_t OutputStride,
1428+
_In_reads_bytes_(sizeof(float) + InputStride * (FloatCount - 1)) const float* pInputStream,
1429+
_In_ size_t InputStride,
1430+
_In_ size_t FloatCount) noexcept;
14311431

14321432
/****************************************************************************
14331433
*

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ For a full change history, see [CHANGELOG.md](https://github.com/microsoft/Direc
108108
* 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:
109109

110110
```cmd
111-
winget install --id=LLVM.LLVM --version 21.1.2
111+
winget install --id=LLVM.LLVM --version 22.1.3
112112
powershell -File build/Format.ps1 -LLVM
113113
```
114114

‎SHMath/DirectXSH.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ _Use_decl_annotations_ float* XM_CALLCONV DirectX::XMSHRotate(float* result, siz
11081108
{
11091109
const unsigned int uBase = iR * 5;
11101110
result[4 + iR] = R[uBase + 0] * input[4] + R[uBase + 1] * input[5] + R[uBase + 2] * input[6] + R[uBase + 3] * input[7]
1111-
+ R[uBase + 4] * input[8];
1111+
+ R[uBase + 4] * input[8];
11121112
}
11131113
}
11141114
break;

‎XDSP/XDSP.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,9 @@ namespace XDSP
328328
assert(ISPOWEROF2(uCount));
329329

330330
static const XMVECTORF32 aUnityTableReal[4] = { { { { 1.0f, 1.0f, 1.0f, 1.0f } } },
331-
{ { { 1.0f, 0.92387950f, 0.70710677f, 0.38268343f } } },
332-
{ { { 1.0f, 0.70710677f, -4.3711388e-008f, -0.70710677f } } },
333-
{ { { 1.0f, 0.38268343f, -0.70710677f, -0.92387950f } } } };
331+
{ { { 1.0f, 0.92387950f, 0.70710677f, 0.38268343f } } },
332+
{ { { 1.0f, 0.70710677f, -4.3711388e-008f, -0.70710677f } } },
333+
{ { { 1.0f, 0.38268343f, -0.70710677f, -0.92387950f } } } };
334334
static const XMVECTORF32 aUnityTableImaginary[4] = { { { { -0.0f, -0.0f, -0.0f, -0.0f } } },
335335
{ { { -0.0f, -0.38268343f, -0.70710677f, -0.92387950f } } },
336336
{ { { -0.0f, -0.70710677f, -1.0f, -0.70710677f } } },

‎build/Format.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This is use to clang-format the code using the rules in .github\linters\.clang-f
1313
The clang-format version must match the version used by GitHub Super-Linter or false positives can be found.
1414
You can install this version locally using:
1515
16-
winget install --id=LLVM.LLVM --version 21.1.2
16+
winget install --id=LLVM.LLVM --version 22.1.3
1717
1818
.PARAMETER Check
1919
Runs clang-format without modifying the files in place.
@@ -58,7 +58,7 @@ if (-not $clangFormatPath -or -not (Test-Path -LiteralPath $clangFormatPath -Pat
5858
}
5959

6060
# This has to match the version used by GitHub super-linter or results will not match.
61-
$requiredClangFormatVersion = '21.1.2'
61+
$requiredClangFormatVersion = '22.1.3'
6262
$clangFormatVersion = (& $clangFormatPath '--version' 2>&1 | Out-String).Trim()
6363
if ($LASTEXITCODE -ne 0) {
6464
throw "Unable to determine clang-format version."

0 commit comments

Comments
 (0)