1
0
mirror of https://github.com/microsoft/DirectXMath synced 2024-09-19 14:49:54 +00:00

Remove Windows 8.0 SDK era adapter

This commit is contained in:
Chuck Walbourn 2018-01-16 14:29:55 -08:00
parent 9e23145f64
commit 33f7f2d0ff
11 changed files with 19 additions and 71 deletions

View File

@ -34,11 +34,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
namespace AVX
{
@ -284,6 +279,6 @@ template<uint32_t Elements>
return AVX::XMVectorSwizzle<(4 - Elements) & 3, (5 - Elements) & 3, (6 - Elements) & 3, (7 - Elements) & 3>(V);
}
}; // namespace AVX
} // namespace AVX
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -35,11 +35,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
namespace AVX2
{
@ -967,6 +962,6 @@ inline void XM_CALLCONV XMStoreHalf4( _Out_ PackedVector::XMHALF4* pDestination,
_mm_storel_epi64( reinterpret_cast<__m128i*>(pDestination), V1 );
}
}; // namespace AVX2
} // namespace AVX2
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -28,11 +28,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
inline XMVECTOR XM_CALLCONV XMVectorEndian
(
@ -100,4 +95,4 @@ inline XMVECTOR XM_CALLCONV XMVectorEndian
}; // namespace SSSE3
#endif // !_M_ARM
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -35,11 +35,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
namespace F16C
{
@ -405,6 +400,6 @@ inline void XM_CALLCONV XMStoreHalf4( _Out_ PackedVector::XMHALF4* pDestination,
_mm_storel_epi64( reinterpret_cast<__m128i*>(pDestination), V1 );
}
}; // namespace F16C
} // namespace F16C
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -34,11 +34,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
namespace FMA3
{
@ -400,6 +395,6 @@ inline XMMATRIX XM_CALLCONV XMMatrixMultiplyTranspose
return mResult;
}
}; // namespace FMA3
} // namespace FMA3
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -34,11 +34,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
namespace FMA4
{
@ -409,6 +404,6 @@ inline XMMATRIX XM_CALLCONV XMMatrixMultiplyTranspose
return mResult;
}
}; // namespace FMA4
} // namespace FMA4
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -30,11 +30,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
namespace SSE3
{
@ -115,6 +110,6 @@ inline XMVECTOR XM_CALLCONV XMVectorSwizzle_1133( FXMVECTOR V )
return _mm_movehdup_ps(V);
}
}; // namespace SSE3
} // namespace SSE3
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -30,11 +30,6 @@
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
namespace SSE4
{
@ -417,6 +412,6 @@ inline XMVECTOR XM_CALLCONV XMPlaneNormalize( FXMVECTOR P )
return vResult;
}
}; // namespace SSE4
} // namespace SSE4
}; // namespace DirectX;
} // namespace DirectX;

View File

@ -13,7 +13,7 @@
#pragma once
#define DIRECTX_SHMATH_VERSION 103
#define DIRECTX_SHMATH_VERSION 104
#include <DirectXMath.h>
@ -24,12 +24,6 @@ struct ID3D11Texture2D;
namespace DirectX
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
const size_t XM_SH_MINORDER = 2;
const size_t XM_SH_MAXORDER = 6;
@ -72,4 +66,4 @@ bool XM_CALLCONV XMSHEvalHemisphereLight( _In_ size_t order, _In_ FXMVECTOR dir,
HRESULT SHProjectCubeMap( _In_ ID3D11DeviceContext *context, _In_ size_t order, _In_ ID3D11Texture2D *cubeMap,
_Out_writes_opt_(order*order) float *resultR, _Out_writes_opt_(order*order) float *resultG, _Out_writes_opt_(order*order) float *resultB );
}; // namespace DirectX
} // namespace DirectX

View File

@ -162,7 +162,7 @@ namespace
}
#pragma warning(pop)
}; // namespace anonymous
} // namespace anonymous
//-------------------------------------------------------------------------------------
// Projects a function represented in a cube map into spherical harmonics.

View File

@ -33,12 +33,6 @@
namespace XDSP
{
#if (DIRECTXMATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const DirectX::XMVECTOR& HXMVECTOR;
typedef const DirectX::XMMATRIX& FXMMATRIX;
#endif
typedef DirectX::XMVECTOR XMVECTOR;
typedef DirectX::FXMVECTOR FXMVECTOR;
typedef DirectX::GXMVECTOR GXMVECTOR;
@ -802,6 +796,6 @@ namespace XDSP
}
}
}; // namespace XDSP
} // namespace XDSP
#pragma warning(pop)