diff options
Diffstat (limited to 'src/angle/patches/0005-Fix-build-when-SSE2-is-not-available.patch')
| -rw-r--r-- | src/angle/patches/0005-Fix-build-when-SSE2-is-not-available.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/angle/patches/0005-Fix-build-when-SSE2-is-not-available.patch b/src/angle/patches/0005-Fix-build-when-SSE2-is-not-available.patch index 1dbf7d387f..78c3e0fbe8 100644 --- a/src/angle/patches/0005-Fix-build-when-SSE2-is-not-available.patch +++ b/src/angle/patches/0005-Fix-build-when-SSE2-is-not-available.patch @@ -1,7 +1,7 @@ -From 747d31f25883f6b9203245a498acf9945accdc0d Mon Sep 17 00:00:00 2001 +From df225c023963f37737b7e2d020c8f89a5d5f878e Mon Sep 17 00:00:00 2001 From: Andy Shaw <andy.shaw@digia.com> -Date: Sat, 28 Jun 2014 17:06:45 +0300 -Subject: [PATCH 05/12] Fix build when SSE2 is not available. +Date: Tue, 16 Sep 2014 23:49:50 +0300 +Subject: [PATCH 05/16] Fix build when SSE2 is not available. Although SSE2 support is detected at runtime it still may not be available at build time, so we have to ensure it only uses SSE2 @@ -14,7 +14,7 @@ Change-Id: I86c45a6466ab4cec79aa0f62b0d5230a78ad825a 2 files changed, 10 insertions(+) diff --git a/src/3rdparty/angle/src/common/mathutil.h b/src/3rdparty/angle/src/common/mathutil.h -index 58f9b4c..f32663f 100644 +index ffcb908..52f2bc1 100644 --- a/src/3rdparty/angle/src/common/mathutil.h +++ b/src/3rdparty/angle/src/common/mathutil.h @@ -118,6 +118,7 @@ inline bool supportsSSE2() @@ -34,10 +34,10 @@ index 58f9b4c..f32663f 100644 checked = true; diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/loadimageSSE2.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/loadimageSSE2.cpp -index 9c83894..dcf347d 100644 +index cc20d94..f777b30 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/loadimageSSE2.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/loadimageSSE2.cpp -@@ -11,6 +11,10 @@ +@@ -10,6 +10,10 @@ #include "libGLESv2/renderer/loadimage.h" @@ -48,7 +48,7 @@ index 9c83894..dcf347d 100644 namespace rx { -@@ -18,6 +22,7 @@ void LoadA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth, +@@ -17,6 +21,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) { @@ -56,7 +56,7 @@ index 9c83894..dcf347d 100644 __m128i zeroWide = _mm_setzero_si128(); for (size_t z = 0; z < depth; z++) -@@ -55,12 +60,14 @@ void LoadA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth, +@@ -54,12 +59,14 @@ void LoadA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth, } } } @@ -71,7 +71,7 @@ index 9c83894..dcf347d 100644 __m128i brMask = _mm_set1_epi32(0x00ff00ff); for (size_t z = 0; z < depth; z++) -@@ -100,6 +107,7 @@ void LoadRGBA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth, +@@ -99,6 +106,7 @@ void LoadRGBA8ToBGRA8_SSE2(size_t width, size_t height, size_t depth, } } } |