gfx/skia/patches/archive/0012-Bug-759683-make-ssse3-conditional.patch

Thu, 15 Jan 2015 21:03:48 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 15 Jan 2015 21:03:48 +0100
branch
TOR_BUG_9701
changeset 11
deefc01c0e14
permissions
-rw-r--r--

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

michael@0 1 diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp
michael@0 2 --- a/gfx/skia/src/opts/opts_check_SSE2.cpp
michael@0 3 +++ b/gfx/skia/src/opts/opts_check_SSE2.cpp
michael@0 4 @@ -91,17 +91,17 @@ static bool cachedHasSSE2() {
michael@0 5
michael@0 6 static bool cachedHasSSSE3() {
michael@0 7 static bool gHasSSSE3 = hasSSSE3();
michael@0 8 return gHasSSSE3;
michael@0 9 }
michael@0 10
michael@0 11 void SkBitmapProcState::platformProcs() {
michael@0 12 if (cachedHasSSSE3()) {
michael@0 13 -#if !defined(SK_BUILD_FOR_ANDROID)
michael@0 14 +#if defined(SK_BUILD_SSSE3)
michael@0 15 // Disable SSSE3 optimization for Android x86
michael@0 16 if (fSampleProc32 == S32_opaque_D32_filter_DX) {
michael@0 17 fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3;
michael@0 18 } else if (fSampleProc32 == S32_alpha_D32_filter_DX) {
michael@0 19 fSampleProc32 = S32_alpha_D32_filter_DX_SSSE3;
michael@0 20 }
michael@0 21
michael@0 22 if (fSampleProc32 == S32_opaque_D32_filter_DXDY) {

mercurial