diff options
author | Mike Klein <mtklein@chromium.org> | 2017-07-18 18:15:13 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-20 19:50:32 +0000 |
commit | 45c16fa82cd2fec010d4cb7763b654a413cabd0c (patch) | |
tree | 2c6e4376e11dca4b4c3ae479b7835096124016f5 /src/core/SkPM4fPriv.h | |
parent | 3f4671871fac8e5439440ce756d0666bc2a96f46 (diff) |
convert over to 2d-mode
[√] convert all stages to use SkJumper_MemoryCtx / be 2d-compatible
[√] convert compile to 2d also, remove 1d run/compile
[√] convert all call sites
[√] no diffs
Change-Id: I3b806eb8fe0c3ec043359616409f7cd1211a1e43
Reviewed-on: https://skia-review.googlesource.com/24263
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkPM4fPriv.h')
-rw-r--r-- | src/core/SkPM4fPriv.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/SkPM4fPriv.h b/src/core/SkPM4fPriv.h index 44f6603cfe..2789d3763e 100644 --- a/src/core/SkPM4fPriv.h +++ b/src/core/SkPM4fPriv.h @@ -15,6 +15,7 @@ #include "SkPM4f.h" #include "SkRasterPipeline.h" #include "SkSRGB.h" +#include "../jumper/SkJumper.h" static inline Sk4f set_alpha(const Sk4f& px, float alpha) { return { px[0], px[1], px[2], alpha }; @@ -148,16 +149,16 @@ static inline void append_gamut_transform(SkRasterPipeline* p, SkArenaAlloc* scr static inline SkColor4f to_colorspace(const SkColor4f& c, SkColorSpace* src, SkColorSpace* dst) { SkColor4f color4f = c; if (src && dst) { - void* color4f_ptr = &color4f; + SkJumper_MemoryCtx color4f_ptr = { &color4f, 0 }; float scratch_matrix_3x4[12]; SkRasterPipeline_<256> p; - p.append(SkRasterPipeline::uniform_color, color4f_ptr); + p.append(SkRasterPipeline::uniform_color, &color4f); append_gamut_transform(&p, scratch_matrix_3x4, src, dst, kUnpremul_SkAlphaType); p.append(SkRasterPipeline::store_f32, &color4f_ptr); - p.run(0,0,1); + p.run(0,0,1,1); } return color4f; } |