diff options
author | Mike Klein <mtklein@google.com> | 2018-05-23 00:06:33 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-23 00:06:46 +0000 |
commit | e60ae82dec8c5dac7997233b17dabdbf677de7da (patch) | |
tree | 39c01598ab9c4e6731421aca867ab09125763d92 /src/core/SkRasterPipeline.h | |
parent | bb08eb2ede89787fb506799f4643d0bf29d72c2d (diff) |
Revert "start cleaning up non-skcms SkColorSpaceXforms"
This reverts commit 339133f82c30cd3080672db28e6f72c894cba05a.
Reason for revert: broke NinePatchDrawableTest.testGetPadding? stranger things have happened.
Original change's description:
> start cleaning up non-skcms SkColorSpaceXforms
>
> I think this gets rid of
> - SkColorSpaceXform_Base
> - SkColorSpaceXform_XYZ
> - SkColorSpaceXform_A2B
> and lots of support code. Might be more left to clean up?
>
> Change-Id: I560d974d1e879dfd6a63ee2244a3dd88bd495c8a
> Reviewed-on: https://skia-review.googlesource.com/129512
> Commit-Queue: Brian Osman <brianosman@google.com>
> Auto-Submit: Mike Klein <mtklein@chromium.org>
> Reviewed-by: Brian Osman <brianosman@google.com>
TBR=mtklein@chromium.org,brianosman@google.com
Change-Id: I9e76195481b8658b34936aeece278d81c286c0fa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/129680
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/core/SkRasterPipeline.h')
-rw-r--r-- | src/core/SkRasterPipeline.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h index 40921f1be7..5eab723cc7 100644 --- a/src/core/SkRasterPipeline.h +++ b/src/core/SkRasterPipeline.h @@ -40,7 +40,7 @@ M(clamp_0) M(clamp_1) M(clamp_a) M(clamp_a_dst) \ M(unpremul) M(premul) M(premul_dst) \ M(force_opaque) M(force_opaque_dst) \ - M(set_rgb) M(swap_rb) \ + M(set_rgb) M(swap_rb) M(invert) \ M(from_srgb) M(from_srgb_dst) M(to_srgb) \ M(black_color) M(white_color) M(uniform_color) \ M(seed_shader) M(dither) \ @@ -54,7 +54,8 @@ M(load_bgra) M(load_bgra_dst) M(store_bgra) M(gather_bgra) \ M(load_1010102) M(load_1010102_dst) M(store_1010102) M(gather_1010102) \ M(bilerp_clamp_8888) \ - M(store_u16_be) \ + M(load_u16_be) M(load_rgb_u16_be) M(store_u16_be) \ + M(load_tables_u16_be) M(load_tables_rgb_u16_be) M(load_tables) \ M(load_rgba) M(store_rgba) \ M(scale_u8) M(scale_565) M(scale_1_float) \ M( lerp_u8) M( lerp_565) M( lerp_1_float) \ @@ -71,9 +72,11 @@ M(matrix_perspective) \ M(parametric_r) M(parametric_g) M(parametric_b) \ M(parametric_a) M(gamma) M(gamma_dst) \ - M(mirror_x) M(repeat_x) \ - M(mirror_y) M(repeat_y) \ - M(decal_x) M(decal_y) M(decal_x_and_y) \ + M(table_r) M(table_g) M(table_b) M(table_a) \ + M(lab_to_xyz) \ + M(mirror_x) M(repeat_x) \ + M(mirror_y) M(repeat_y) \ + M(decal_x) M(decal_y) M(decal_x_and_y) \ M(check_decal_mask) \ M(negate_x) \ M(bilinear_nx) M(bilinear_px) M(bilinear_ny) M(bilinear_py) \ @@ -95,8 +98,9 @@ M(alter_2pt_conical_unswap) \ M(mask_2pt_conical_nan) \ M(mask_2pt_conical_degenerates) M(apply_vector_mask) \ - M(byte_tables) \ + M(byte_tables) M(byte_tables_rgb) \ M(rgb_to_hsl) M(hsl_to_rgb) \ + M(clut_3D) M(clut_4D) \ M(gauss_a_to_rgba) class SkRasterPipeline { |