aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkRasterPipeline.cpp
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@google.com>2017-09-16 00:41:27 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-16 00:41:35 +0000
commit6e80aea309d90ae6618fb5df4eb0fb81d63d8278 (patch)
tree76f4dc108a5f2dea726d94d801ee18f740da5194 /src/core/SkRasterPipeline.cpp
parent6492afa7971cf295a3c3cb92a85218917c02bb4a (diff)
Revert "Bump stored lowp uniform color to 16-bit storage."
This reverts commit d286bfbd96f8b7ccf1cbce74f07d2f3917dbec30. Reason for revert: ../../../src/core/SkRasterPipeline.cpp:98:34: runtime error: 4.87906e+09 is outside the range of representable values of type 'unsigned short' Excellent new bot! Original change's description: > Bump stored lowp uniform color to 16-bit storage. > > This makes loading into 16-bit channels more natural in _lowp.cpp. > > Change-Id: I1ed393873654060ef52f4632d670465528006bbd > Reviewed-on: https://skia-review.googlesource.com/47261 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Klein <mtklein@chromium.org> TBR=mtklein@chromium.org,reed@google.com Change-Id: Ia65645c1261a7b31588c4ddaf2b1b3b327d265b0 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/47540 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/core/SkRasterPipeline.cpp')
-rw-r--r--src/core/SkRasterPipeline.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/SkRasterPipeline.cpp b/src/core/SkRasterPipeline.cpp
index aabb365b23..a8c4c0de73 100644
--- a/src/core/SkRasterPipeline.cpp
+++ b/src/core/SkRasterPipeline.cpp
@@ -92,13 +92,7 @@ void SkRasterPipeline::append_constant_color(SkArenaAlloc* alloc, const float rg
auto ctx = alloc->make<SkJumper_UniformColorCtx>();
Sk4f color = Sk4f::Load(rgba);
color.store(&ctx->r);
-
- // To make loads more direct, we store 8-bit values in 16-bit slots.
- color = color * 255.0f + 0.5f;
- ctx->rgba[0] = (uint16_t)color[0];
- ctx->rgba[1] = (uint16_t)color[1];
- ctx->rgba[2] = (uint16_t)color[2];
- ctx->rgba[3] = (uint16_t)color[3];
+ ctx->rgba = Sk4f_toL32(color);
this->unchecked_append(uniform_color, ctx);
INC_COLOR;