Skip to content

Commit 796cd4d

Browse files
ericstone93ericstone93
authored
Skip including cpuid.h under Windows with Clang-cl (#296)
1 parent 4dc9bc2 commit 796cd4d

10 files changed

Lines changed: 25 additions & 25 deletions

‎Extensions/DirectXMathAVX.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace DirectX
2828

2929
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
3030
int CPUInfo[4] = { -1 };
31-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
31+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
3232
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
3333
#else
3434
__cpuid(CPUInfo, 0);
@@ -37,7 +37,7 @@ namespace DirectX
3737
if (CPUInfo[0] < 1)
3838
return false;
3939

40-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
40+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
4141
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
4242
#else
4343
__cpuid(CPUInfo, 1);

‎Extensions/DirectXMathAVX2.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace DirectX
2929

3030
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
3131
int CPUInfo[4] = { -1 };
32-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
32+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
3333
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
3434
#else
3535
__cpuid(CPUInfo, 0);
@@ -38,7 +38,7 @@ namespace DirectX
3838
if (CPUInfo[0] < 7)
3939
return false;
4040

41-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
41+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
4242
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
4343
#else
4444
__cpuid(CPUInfo, 1);
@@ -48,7 +48,7 @@ namespace DirectX
4848
if ((CPUInfo[2] & 0x38081001) != 0x38081001)
4949
return false;
5050

51-
#if defined(__clang__) || defined(__GNUC__)
51+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
5252
__cpuid_count(7, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
5353
#else
5454
__cpuidex(CPUInfo, 7, 0);

‎Extensions/DirectXMathBE.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace DirectX
5959

6060
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
6161
int CPUInfo[4] = { -1 };
62-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
62+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
6363
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
6464
#else
6565
__cpuid(CPUInfo, 0);
@@ -68,7 +68,7 @@ namespace DirectX
6868
if (CPUInfo[0] < 1)
6969
return false;
7070

71-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
71+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
7272
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
7373
#else
7474
__cpuid(CPUInfo, 1);

‎Extensions/DirectXMathF16C.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace DirectX
2929

3030
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
3131
int CPUInfo[4] = { -1 };
32-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
32+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
3333
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
3434
#else
3535
__cpuid(CPUInfo, 0);
@@ -38,7 +38,7 @@ namespace DirectX
3838
if (CPUInfo[0] < 1)
3939
return false;
4040

41-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
41+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
4242
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
4343
#else
4444
__cpuid(CPUInfo, 1);

‎Extensions/DirectXMathFMA3.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace DirectX
2828

2929
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
3030
int CPUInfo[4] = { -1 };
31-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
31+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
3232
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
3333
#else
3434
__cpuid(CPUInfo, 0);
@@ -37,7 +37,7 @@ namespace DirectX
3737
if (CPUInfo[0] < 1)
3838
return false;
3939

40-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
40+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
4141
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
4242
#else
4343
__cpuid(CPUInfo, 1);

‎Extensions/DirectXMathFMA4.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace DirectX
3333

3434
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
3535
int CPUInfo[4] = { -1 };
36-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
36+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
3737
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
3838
#else
3939
__cpuid(CPUInfo, 0);
@@ -42,7 +42,7 @@ namespace DirectX
4242
if (CPUInfo[0] < 1)
4343
return false;
4444

45-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
45+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
4646
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
4747
#else
4848
__cpuid(CPUInfo, 1);
@@ -52,20 +52,20 @@ namespace DirectX
5252
if ((CPUInfo[2] & 0x18000000) != 0x18000000)
5353
return false;
5454

55-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
55+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
5656
__cpuid(0x80000000, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
5757
#else
58-
__cpuid(CPUInfo, 0x80000000);
58+
__cpuid(CPUInfo, static_cast<int>(0x80000000));
5959
#endif
6060

6161
if (uint32_t(CPUInfo[0]) < 0x80000001u)
6262
return false;
6363

6464
// We check for FMA4
65-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
65+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
6666
__cpuid(0x80000001, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
6767
#else
68-
__cpuid(CPUInfo, 0x80000001);
68+
__cpuid(CPUInfo, static_cast<int>(0x80000001));
6969
#endif
7070

7171
return (CPUInfo[2] & 0x10000);

‎Extensions/DirectXMathSSE3.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ namespace DirectX
2929

3030
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
3131
int CPUInfo[4] = { -1 };
32-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
32+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
3333
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
3434
#else
3535
__cpuid(CPUInfo, 0);
3636
#endif
3737
if (CPUInfo[0] < 1)
3838
return false;
3939

40-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
40+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
4141
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
4242
#else
4343
__cpuid(CPUInfo, 1);

‎Extensions/DirectXMathSSE4.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ namespace DirectX
2929

3030
// See https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
3131
int CPUInfo[4] = { -1 };
32-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
32+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
3333
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
3434
#else
3535
__cpuid(CPUInfo, 0);
3636
#endif
3737
if (CPUInfo[0] < 1)
3838
return false;
3939

40-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
40+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
4141
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
4242
#else
4343
__cpuid(CPUInfo, 1);

‎Inc/DirectXMath.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
#pragma warning(pop)
125125
#endif
126126

127-
#if (defined(__clang__) || defined(__GNUC__)) && (__x86_64__ || __i386__) && !defined(__MINGW32__)
127+
#if (defined(__clang__) || defined(__GNUC__)) && (__x86_64__ || __i386__) && !defined(__MINGW32__) && !defined(_MSC_VER)
128128
#include <cpuid.h>
129129
#endif
130130

‎Inc/DirectXMathMisc.inl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ inline bool XMVerifyCPUSupport() noexcept
19731973
{
19741974
#if defined(_XM_SSE_INTRINSICS_) && !defined(__powerpc64__) && !defined(_XM_NO_INTRINSICS_)
19751975
int CPUInfo[4] = { -1 };
1976-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
1976+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
19771977
__cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
19781978
#else
19791979
__cpuid(CPUInfo, 0);
@@ -1987,7 +1987,7 @@ inline bool XMVerifyCPUSupport() noexcept
19871987
return false;
19881988
#endif
19891989

1990-
#if (defined(__clang__) || defined(__GNUC__)) && defined(__cpuid)
1990+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
19911991
__cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
19921992
#else
19931993
__cpuid(CPUInfo, 1);
@@ -2022,7 +2022,7 @@ inline bool XMVerifyCPUSupport() noexcept
20222022
return false; // No SSE2/SSE support
20232023

20242024
#if defined(__AVX2__) || defined(_XM_AVX2_INTRINSICS_)
2025-
#if defined(__clang__) || defined(__GNUC__)
2025+
#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
20262026
__cpuid_count(7, 0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
20272027
#else
20282028
__cpuidex(CPUInfo, 7, 0);

0 commit comments

Comments
 (0)