Don't use SSE functions on Android.

src/common/platform.h

@@ -14,12 +14,12 @@
 #elif defined(__APPLE__)
 #   define ANGLE_PLATFORM_APPLE 1
 #   define ANGLE_PLATFORM_POSIX 1
-#elif defined(__linux__) || defined(EMSCRIPTEN)
-#   define ANGLE_PLATFORM_LINUX 1
-#   define ANGLE_PLATFORM_POSIX 1
 #elif defined(ANDROID)
 #   define ANGLE_PLATFORM_ANDROID 1
 #   define ANGLE_PLATFORM_POSIX 1
+#elif defined(__linux__) || defined(EMSCRIPTEN)
+#   define ANGLE_PLATFORM_LINUX 1
+#   define ANGLE_PLATFORM_POSIX 1
 #elif defined(__FreeBSD__) || \
       defined(__OpenBSD__) || \
       defined(__NetBSD__) || \
@@ -78,7 +78,11 @@
 
 #ifdef ANGLE_PLATFORM_APPLE
     // TODO(jmadill): other OSX-specific includes
-    #include <x86intrin.h>
+#   include <x86intrin.h>
+#endif
+
+#if !defined(ANGLE_PLATFORM_WINDOWS_STORE) && !defined(ANGLE_PLATFORM_ANDROID)
+#   define ANGLE_USE_SSE
 #endif
 
 #endif // COMMON_PLATFORM_H_

src/libANGLE/renderer/loadimageSSE2.cpp

@@ -10,6 +10,8 @@
 
 #include "libANGLE/renderer/loadimage.h"
 
+#include "common/platform.h"
+
 namespace rx
 {
 
@@ -17,12 +19,7 @@ void LoadA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth,
                         const uint8_t *input, size_t inputRowPitch, size_t inputDepthPitch,
                         uint8_t *output, size_t outputRowPitch, size_t outputDepthPitch)
 {
-#if defined(_M_ARM)
-    // Ensure that this function is reported as not implemented for ARM builds because
-    // the instructions below are not present for that architecture.
-    UNIMPLEMENTED();
-    return;
-#else
+#if defined(ANGLE_USE_SSE)
     __m128i zeroWide = _mm_setzero_si128();
 
     for (size_t z = 0; z < depth; z++)
@@ -60,6 +57,11 @@ void LoadA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth,
             }
         }
     }
+#else
+    // Ensure that this function is reported as not implemented for ARM builds because
+    // the instructions below are not present for that architecture.
+    UNIMPLEMENTED();
+    return;
 #endif
 }
 
@@ -67,12 +69,7 @@ void LoadRGBA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth,
                            const uint8_t *input, size_t inputRowPitch, size_t inputDepthPitch,
                            uint8_t *output, size_t outputRowPitch, size_t outputDepthPitch)
 {
-#if defined(_M_ARM)
-    // Ensure that this function is reported as not implemented for ARM builds because
-    // the instructions below are not present for that architecture.
-    UNIMPLEMENTED();
-    return;
-#else
+#if defined(ANGLE_USE_SSE)
     __m128i brMask = _mm_set1_epi32(0x00ff00ff);
 
     for (size_t z = 0; z < depth; z++)
@@ -112,7 +109,13 @@ void LoadRGBA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth,
             }
         }
     }
+#else
+    // Ensure that this function is reported as not implemented for ARM builds because
+    // the instructions below are not present for that architecture.
+    UNIMPLEMENTED();
+    return;
 #endif
 }
 
 }
+