Make Angle compile for Arm64 Windows

Change-Id: Iee947a5abf4a833f155f7cb100577c92323a34e5 Reviewed-on: https://chromium-review.googlesource.com/1160863Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Make Angle compile for Arm64 Windows
cb4ae446 · Thomas Miller · Commit Bot · cc73f241 · cb4ae446 · cb4ae446
Commit cb4ae446 authored Aug 02, 2018 by Thomas Miller Committed by Commit Bot Aug 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

AUTHORS AUTHORS +1 -0

mathutil.h src/common/mathutil.h +2 -2

platform.h src/common/platform.h +1 -1

No files found.
--- a/AUTHORS
+++ b/AUTHORS
@@ -52,3 +52,4 @@ Ihsan Akmal
 Andrei Volykhin
 Jérôme Duval
 Руслан Ижбулатов
+Thomas Miller
--- a/src/common/mathutil.h
+++ b/src/common/mathutil.h
@@ -152,7 +152,7 @@ inline bool supportsSSE2()
        return supports;
    }

-#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM)
+#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
    {
        int info[4];
        __cpuid(info, 0);
@@ -164,7 +164,7 @@ inline bool supportsSSE2()
            supports = (info[3] >> 26) & 1;
        }
    }
-#endif  // defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM)
+#endif  // defined(ANGLE_PLATFORM_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
    checked = true;
    return supports;
 #else  // defined(ANGLE_USE_SSE)

--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -84,7 +84,7 @@
 #   undef far
 #endif

-#if defined(_MSC_VER) && !defined(_M_ARM)
+#if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
 #include <intrin.h>
 #define ANGLE_USE_SSE
 #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))