Skip to content

Commit 33f7f2d

Browse files
walbournwalbourn
committed
Remove Windows 8.0 SDK era adapter
1 parent 9e23145 commit 33f7f2d

11 files changed

+19
-71
lines changed

‎Extensions/DirectXMathAVX.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434

3535
namespace DirectX
3636
{
37-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
38-
#define XM_CALLCONV __fastcall
39-
typedef const DirectX::XMVECTOR& HXMVECTOR;
40-
typedef const DirectX::XMMATRIX& FXMMATRIX;
41-
#endif
4237

4338
namespace AVX
4439
{
@@ -284,6 +279,6 @@ template<uint32_t Elements>
284279
return AVX::XMVectorSwizzle<(4 - Elements) & 3, (5 - Elements) & 3, (6 - Elements) & 3, (7 - Elements) & 3>(V);
285280
}
286281

287-
}; // namespace AVX
282+
} // namespace AVX
288283

289-
}; // namespace DirectX;
284+
} // namespace DirectX;

‎Extensions/DirectXMathAVX2.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535

3636
namespace DirectX
3737
{
38-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
39-
#define XM_CALLCONV __fastcall
40-
typedef const DirectX::XMVECTOR& HXMVECTOR;
41-
typedef const DirectX::XMMATRIX& FXMMATRIX;
42-
#endif
4338

4439
namespace AVX2
4540
{
@@ -967,6 +962,6 @@ inline void XM_CALLCONV XMStoreHalf4( _Out_ PackedVector::XMHALF4* pDestination,
967962
_mm_storel_epi64( reinterpret_cast<__m128i*>(pDestination), V1 );
968963
}
969964

970-
}; // namespace AVX2
965+
} // namespace AVX2
971966

972-
}; // namespace DirectX;
967+
} // namespace DirectX;

‎Extensions/DirectXMathBE.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828

2929
namespace DirectX
3030
{
31-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
32-
#define XM_CALLCONV __fastcall
33-
typedef const DirectX::XMVECTOR& HXMVECTOR;
34-
typedef const DirectX::XMMATRIX& FXMMATRIX;
35-
#endif
3631

3732
inline XMVECTOR XM_CALLCONV XMVectorEndian
3833
(
@@ -100,4 +95,4 @@ inline XMVECTOR XM_CALLCONV XMVectorEndian
10095
}; // namespace SSSE3
10196
#endif // !_M_ARM
10297

103-
}; // namespace DirectX;
98+
} // namespace DirectX;

‎Extensions/DirectXMathF16C.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535

3636
namespace DirectX
3737
{
38-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
39-
#define XM_CALLCONV __fastcall
40-
typedef const DirectX::XMVECTOR& HXMVECTOR;
41-
typedef const DirectX::XMMATRIX& FXMMATRIX;
42-
#endif
4338

4439
namespace F16C
4540
{
@@ -405,6 +400,6 @@ inline void XM_CALLCONV XMStoreHalf4( _Out_ PackedVector::XMHALF4* pDestination,
405400
_mm_storel_epi64( reinterpret_cast<__m128i*>(pDestination), V1 );
406401
}
407402

408-
}; // namespace F16C
403+
} // namespace F16C
409404

410-
}; // namespace DirectX;
405+
} // namespace DirectX;

‎Extensions/DirectXMathFMA3.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434

3535
namespace DirectX
3636
{
37-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
38-
#define XM_CALLCONV __fastcall
39-
typedef const DirectX::XMVECTOR& HXMVECTOR;
40-
typedef const DirectX::XMMATRIX& FXMMATRIX;
41-
#endif
4237

4338
namespace FMA3
4439
{
@@ -400,6 +395,6 @@ inline XMMATRIX XM_CALLCONV XMMatrixMultiplyTranspose
400395
return mResult;
401396
}
402397

403-
}; // namespace FMA3
398+
} // namespace FMA3
404399

405-
}; // namespace DirectX;
400+
} // namespace DirectX;

‎Extensions/DirectXMathFMA4.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434

3535
namespace DirectX
3636
{
37-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
38-
#define XM_CALLCONV __fastcall
39-
typedef const DirectX::XMVECTOR& HXMVECTOR;
40-
typedef const DirectX::XMMATRIX& FXMMATRIX;
41-
#endif
4237

4338
namespace FMA4
4439
{
@@ -409,6 +404,6 @@ inline XMMATRIX XM_CALLCONV XMMatrixMultiplyTranspose
409404
return mResult;
410405
}
411406

412-
}; // namespace FMA4
407+
} // namespace FMA4
413408

414-
}; // namespace DirectX;
409+
} // namespace DirectX;

‎Extensions/DirectXMathSSE3.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030

3131
namespace DirectX
3232
{
33-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
34-
#define XM_CALLCONV __fastcall
35-
typedef const DirectX::XMVECTOR& HXMVECTOR;
36-
typedef const DirectX::XMMATRIX& FXMMATRIX;
37-
#endif
3833

3934
namespace SSE3
4035
{
@@ -115,6 +110,6 @@ inline XMVECTOR XM_CALLCONV XMVectorSwizzle_1133( FXMVECTOR V )
115110
return _mm_movehdup_ps(V);
116111
}
117112

118-
}; // namespace SSE3
113+
} // namespace SSE3
119114

120-
}; // namespace DirectX;
115+
} // namespace DirectX;

‎Extensions/DirectXMathSSE4.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030

3131
namespace DirectX
3232
{
33-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
34-
#define XM_CALLCONV __fastcall
35-
typedef const DirectX::XMVECTOR& HXMVECTOR;
36-
typedef const DirectX::XMMATRIX& FXMMATRIX;
37-
#endif
3833

3934
namespace SSE4
4035
{
@@ -417,6 +412,6 @@ inline XMVECTOR XM_CALLCONV XMPlaneNormalize( FXMVECTOR P )
417412
return vResult;
418413
}
419414

420-
}; // namespace SSE4
415+
} // namespace SSE4
421416

422-
}; // namespace DirectX;
417+
} // namespace DirectX;

‎SHMath/DirectXSH.h

+2-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#pragma once
1515

16-
#define DIRECTX_SHMATH_VERSION 103
16+
#define DIRECTX_SHMATH_VERSION 104
1717

1818
#include <DirectXMath.h>
1919

@@ -24,12 +24,6 @@ struct ID3D11Texture2D;
2424

2525
namespace DirectX
2626
{
27-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
28-
#define XM_CALLCONV __fastcall
29-
typedef const DirectX::XMVECTOR& HXMVECTOR;
30-
typedef const DirectX::XMMATRIX& FXMMATRIX;
31-
#endif
32-
3327
const size_t XM_SH_MINORDER = 2;
3428
const size_t XM_SH_MAXORDER = 6;
3529

@@ -72,4 +66,4 @@ bool XM_CALLCONV XMSHEvalHemisphereLight( _In_ size_t order, _In_ FXMVECTOR dir,
7266
HRESULT SHProjectCubeMap( _In_ ID3D11DeviceContext *context, _In_ size_t order, _In_ ID3D11Texture2D *cubeMap,
7367
_Out_writes_opt_(order*order) float *resultR, _Out_writes_opt_(order*order) float *resultG, _Out_writes_opt_(order*order) float *resultB );
7468

75-
}; // namespace DirectX
69+
} // namespace DirectX

‎SHMath/DirectXSHD3D11.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ namespace
162162
}
163163
#pragma warning(pop)
164164

165-
}; // namespace anonymous
165+
} // namespace anonymous
166166

167167
//-------------------------------------------------------------------------------------
168168
// Projects a function represented in a cube map into spherical harmonics.

‎XDSP/XDSP.h

+1-7
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333

3434
namespace XDSP
3535
{
36-
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
37-
#define XM_CALLCONV __fastcall
38-
typedef const DirectX::XMVECTOR& HXMVECTOR;
39-
typedef const DirectX::XMMATRIX& FXMMATRIX;
40-
#endif
41-
4236
typedef DirectX::XMVECTOR XMVECTOR;
4337
typedef DirectX::FXMVECTOR FXMVECTOR;
4438
typedef DirectX::GXMVECTOR GXMVECTOR;
@@ -802,6 +796,6 @@ namespace XDSP
802796
}
803797
}
804798

805-
}; // namespace XDSP
799+
} // namespace XDSP
806800

807801
#pragma warning(pop)

0 commit comments

Comments
 (0)