mirror of
https://github.com/microsoft/DirectXMath
synced 2024-11-22 12:20:06 +00:00
Replace typedefs with 'using' declarations
This commit is contained in:
parent
eb2ac849e7
commit
631a64529b
@ -359,27 +359,27 @@ namespace DirectX
|
|||||||
|
|
||||||
// Fix-up for (1st-3rd) XMVECTOR parameters that are pass-in-register for x86, ARM, ARM64, and vector call; by reference otherwise
|
// Fix-up for (1st-3rd) XMVECTOR parameters that are pass-in-register for x86, ARM, ARM64, and vector call; by reference otherwise
|
||||||
#if ( defined(_M_IX86) || defined(_M_ARM) || defined(_M_ARM64) || _XM_VECTORCALL_ || __i386__ || __arm__ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
#if ( defined(_M_IX86) || defined(_M_ARM) || defined(_M_ARM64) || _XM_VECTORCALL_ || __i386__ || __arm__ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
||||||
typedef const XMVECTOR FXMVECTOR;
|
using FXMVECTOR = const XMVECTOR;
|
||||||
#else
|
#else
|
||||||
typedef const XMVECTOR& FXMVECTOR;
|
using FXMVECTOR = const XMVECTOR&;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Fix-up for (4th) XMVECTOR parameter to pass in-register for ARM, ARM64, and vector call; by reference otherwise
|
// Fix-up for (4th) XMVECTOR parameter to pass in-register for ARM, ARM64, and vector call; by reference otherwise
|
||||||
#if ( defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || _XM_VECTORCALL_ || __arm__ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
#if ( defined(_M_ARM) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || _XM_VECTORCALL_ || __arm__ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
||||||
typedef const XMVECTOR GXMVECTOR;
|
using GXMVECTOR = const XMVECTOR;
|
||||||
#else
|
#else
|
||||||
typedef const XMVECTOR& GXMVECTOR;
|
using GXMVECTOR = const XMVECTOR&;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Fix-up for (5th & 6th) XMVECTOR parameter to pass in-register for ARM64 and vector call; by reference otherwise
|
// Fix-up for (5th & 6th) XMVECTOR parameter to pass in-register for ARM64 and vector call; by reference otherwise
|
||||||
#if ( defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || _XM_VECTORCALL_ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
#if ( defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || _XM_VECTORCALL_ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
||||||
typedef const XMVECTOR HXMVECTOR;
|
using HXMVECTOR = const XMVECTOR;
|
||||||
#else
|
#else
|
||||||
typedef const XMVECTOR& HXMVECTOR;
|
using HXMVECTOR = const XMVECTOR&;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Fix-up for (7th+) XMVECTOR parameters to pass by reference
|
// Fix-up for (7th+) XMVECTOR parameters to pass by reference
|
||||||
typedef const XMVECTOR& CXMVECTOR;
|
using CXMVECTOR = const XMVECTOR&;
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// Conversion types for constants
|
// Conversion types for constants
|
||||||
@ -492,13 +492,13 @@ namespace DirectX
|
|||||||
|
|
||||||
// Fix-up for (1st) XMMATRIX parameter to pass in-register for ARM64 and vector call; by reference otherwise
|
// Fix-up for (1st) XMMATRIX parameter to pass in-register for ARM64 and vector call; by reference otherwise
|
||||||
#if ( defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || _XM_VECTORCALL_ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
#if ( defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || _XM_VECTORCALL_ || __aarch64__ ) && !defined(_XM_NO_INTRINSICS_)
|
||||||
typedef const XMMATRIX FXMMATRIX;
|
using FXMMATRIX = const XMMATRIX;
|
||||||
#else
|
#else
|
||||||
typedef const XMMATRIX& FXMMATRIX;
|
using FXMMATRIX = const XMMATRIX&;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Fix-up for (2nd+) XMMATRIX parameters to pass by reference
|
// Fix-up for (2nd+) XMMATRIX parameters to pass by reference
|
||||||
typedef const XMMATRIX& CXMMATRIX;
|
using CXMMATRIX = const XMMATRIX&;
|
||||||
|
|
||||||
#ifdef _XM_NO_INTRINSICS_
|
#ifdef _XM_NO_INTRINSICS_
|
||||||
struct XMMATRIX
|
struct XMMATRIX
|
||||||
|
@ -104,7 +104,7 @@ namespace
|
|||||||
const float SHEvalHemisphereLight_fSqrtPi = sqrtf(XM_PI);
|
const float SHEvalHemisphereLight_fSqrtPi = sqrtf(XM_PI);
|
||||||
const float SHEvalHemisphereLight_fSqrtPi3 = sqrtf(XM_PI / 3.0f);
|
const float SHEvalHemisphereLight_fSqrtPi3 = sqrtf(XM_PI / 3.0f);
|
||||||
|
|
||||||
typedef float REAL;
|
using REAL = float;
|
||||||
#define CONSTANT(x) (x ## f)
|
#define CONSTANT(x) (x ## f)
|
||||||
|
|
||||||
// routine generated programmatically for evaluating SH basis for degree 1
|
// routine generated programmatically for evaluating SH basis for degree 1
|
||||||
|
Loading…
Reference in New Issue
Block a user