Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/linters/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ BraceWrapping:
BeforeLambdaBody: true
SplitEmptyFunction: false
SplitEmptyRecord: false
#requires clang-format 22
Comment thread
walbourn marked this conversation as resolved.
Resolved
#BreakAfterOpenBracketFunction: true
#BreakBeforeCloseBracketFunction: true
BreakBeforeBinaryOperators: All
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: BeforeColon
Expand All @@ -70,8 +67,6 @@ PointerAlignment: Left
ReflowComments: true
SortIncludes: false
SpaceAfterCStyleCast: false
#requires clang format 21
#SpaceAfterOperatorKeyword: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions Inc/DirectXCollision.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

//-------------------------------------------------------------------------------------
Expand Down
66 changes: 33 additions & 33 deletions Inc/DirectXMath.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Inc/DirectXMathMisc.inl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions Inc/DirectXPackedVector.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/****************************************************************************
*
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion SHMath/DirectXSH.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions XDSP/XDSP.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 } } },
Expand Down
4 changes: 2 additions & 2 deletions build/Format.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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."
Expand Down
Loading