diff options
| author |  mtklein <mtklein@chromium.org> | 2014-09-03 07:02:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-03 07:02:07 -0700 |
| commit | eddb113ec65226a1563fe9e623e7408443499028 (patch) | |
| tree | 4d1955704fb4dec047d7b8294a5d67891dccefb7 /src | |
| parent | 1cf15b47352ff1f69912e429f149a47a14e6d717 (diff) | |
Disable SSE4 S32A_Opaque blit.
This code sometimes generates a build warning that bothers Chrome.
BUG=399842,skia:2906
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/538463003
Diffstat (limited to 'src')
| -rw-r--r-- | src/opts/SkBlitRow_opts_SSE4.h | 4 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_SSE4_asm.S | 4 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_SSE4_x64_asm.S | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/opts/SkBlitRow_opts_SSE4.h b/src/opts/SkBlitRow_opts_SSE4.h index f202aa5139..600e669893 100644 --- a/src/opts/SkBlitRow_opts_SSE4.h +++ b/src/opts/SkBlitRow_opts_SSE4.h @@ -10,6 +10,8 @@ #include "SkBlitRow.h" +#ifdef CRBUG_399842_FIXED + /* Check if we are able to build assembly code, GCC/AT&T syntax: * 1) Clang and GCC are generally OK. OS X's old LLVM-GCC 4.2 can't handle it; * 2) We're intentionally not linking this in even when supported (Clang) on Windows; @@ -25,5 +27,7 @@ extern "C" void S32A_Opaque_BlitRow32_SSE4_asm(SkPMColor* SK_RESTRICT dst, #define SK_ATT_ASM_SUPPORTED #endif +#endif // CRBUG_399842_FIXED + #endif diff --git a/src/opts/SkBlitRow_opts_SSE4_asm.S b/src/opts/SkBlitRow_opts_SSE4_asm.S index 417e517f92..0f5281713d 100644 --- a/src/opts/SkBlitRow_opts_SSE4_asm.S +++ b/src/opts/SkBlitRow_opts_SSE4_asm.S @@ -5,6 +5,8 @@ * found in the LICENSE file. */ +#ifdef CRBUG_399842_FIXED + #if defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC)) #define CFI_PUSH(REG) \ @@ -469,3 +471,5 @@ S32A_Opaque_BlitRow32_SSE4_asm: .size S32A_Opaque_BlitRow32_SSE4_asm, .-S32A_Opaque_BlitRow32_SSE4_asm #endif #endif + +#endif // CRBUG_399842_FIXED diff --git a/src/opts/SkBlitRow_opts_SSE4_x64_asm.S b/src/opts/SkBlitRow_opts_SSE4_x64_asm.S index 41a147e9a3..9a754a635b 100644 --- a/src/opts/SkBlitRow_opts_SSE4_x64_asm.S +++ b/src/opts/SkBlitRow_opts_SSE4_x64_asm.S @@ -5,6 +5,8 @@ * found in the LICENSE file. */ +#ifdef CRBUG_399842_FIXED + #if defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC)) #define EXTRACT_ALPHA(var1, var2) \ @@ -466,3 +468,5 @@ S32A_Opaque_BlitRow32_SSE4_asm: .LResultMergeMask: .long 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF #endif + +#endif // CRBUG_399842_FIXED |