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
20 changes: 20 additions & 0 deletions Inc/DirectXMath.h
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,15 @@ namespace DirectX
// Fix-up for (2nd+) XMMATRIX parameters to pass by reference
typedef const XMMATRIX& CXMMATRIX;

#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
#pragma clang diagnostic ignored "-Wnested-anon-types"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
Comment thread
walbourn marked this conversation as resolved.
#endif

#ifdef _XM_NO_INTRINSICS_
struct XMMATRIX
#else
Expand Down Expand Up @@ -713,6 +722,12 @@ namespace DirectX
friend XMMATRIX XM_CALLCONV operator*(float S, FXMMATRIX M) noexcept;
};

#ifdef __clang__
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

//------------------------------------------------------------------------------
// 2D Vector; 32 bit floating point components
struct XMFLOAT2
Expand Down Expand Up @@ -1031,6 +1046,9 @@ namespace DirectX
#pragma clang diagnostic ignored "-Wnested-anon-types"
#pragma clang diagnostic ignored "-Wunknown-warning-option"
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#endif

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1412,6 +1430,8 @@ namespace DirectX

#ifdef __clang__
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#ifdef _PREFAST_
#pragma prefast(pop)
Expand Down
2 changes: 2 additions & 0 deletions Inc/DirectXMathMatrix.inl
Original file line number Diff line number Diff line change
Expand Up @@ -1137,6 +1137,8 @@ _Use_decl_annotations_ inline bool
fAbsZ = fabsf(XMVectorGetZ(ppvBasis[a][0]));

XM3RANKDECOMPOSE(aa, bb, cc, fAbsX, fAbsY, fAbsZ)
(void)aa;
(void)bb;

ppvBasis[b][0] = XMVector3Cross(ppvBasis[a][0], pvCanonicalBasis[cc][0]);
}
Expand Down
5 changes: 5 additions & 0 deletions Inc/DirectXPackedVector.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ namespace DirectX
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
#pragma clang diagnostic ignored "-Wnested-anon-types"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#endif

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -1400,6 +1403,8 @@ namespace DirectX

#ifdef __clang__
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#ifdef _MSC_VER
#pragma warning(pop)
Expand Down
Loading