diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-06-28 10:06:14 -0400 |
|---|---|---|
| committer |  Mike Klein <mtklein@google.com> | 2017-06-28 14:18:52 +0000 |
| commit | cefd059b2a5902e26e6ca6dd69335e22f7033a3a (patch) | |
| tree | f524a9a275db6a58007b1445e6496168e42b3fa5 /src | |
| parent | 746e2632c645fa616e6989787b27a1e6274243e3 (diff) | |
be more explicit about not expecting 32-bit x86 jumper backend on windows
Looks like Clang/Win is defining __i386__, but we're not linking in
stage functions (they don't exist yet for Windows).
Change-Id: I78fdd3e1d89020bc6c64bc1cd5dfb3fbca720b2e
Reviewed-on: https://skia-review.googlesource.com/21103
Commit-Queue: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jumper/SkJumper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jumper/SkJumper.cpp b/src/jumper/SkJumper.cpp index 4d01e6f0b3..1b4cb3bb59 100644 --- a/src/jumper/SkJumper.cpp +++ b/src/jumper/SkJumper.cpp @@ -154,7 +154,7 @@ extern "C" { LOWP_STAGES(M) #undef M -#elif defined(__i386__) +#elif defined(__i386__) && !defined(_MSC_VER) StartPipelineFn ASM(start_pipeline,sse2); StageFn ASM(just_return,sse2); #define M(st) StageFn ASM(st,sse2); @@ -263,7 +263,7 @@ static SkJumper_Engine choose_engine() { }; } -#elif defined(__i386__) +#elif defined(__i386__) && !defined(_MSC_VER) if (1 && SkCpu::Supports(SkCpu::SSE2)) { return { #define M(stage) ASM(stage, sse2), |