diff options
author | mtklein <mtklein@chromium.org> | 2016-07-13 13:30:49 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-13 13:30:49 -0700 |
commit | 05c73b7ed5b73a55cbecf7f787a35fcc0e84e983 (patch) | |
tree | c717b54ed59ee5e9f742aa546f03cc50c93e3c11 | |
parent | dda54455a20dcd89de610bdb80e4a8e9137b80a4 (diff) |
Remove bulk float <-> half routines. These are dead code.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2152583002
Review-Url: https://codereview.chromium.org/2152583002
-rw-r--r-- | bench/HalfBench.cpp | 48 | ||||
-rw-r--r-- | src/core/SkOpts.cpp | 16 | ||||
-rw-r--r-- | src/core/SkOpts.h | 3 | ||||
-rw-r--r-- | tests/Float16Test.cpp | 13 |
4 files changed, 0 insertions, 80 deletions
diff --git a/bench/HalfBench.cpp b/bench/HalfBench.cpp deleted file mode 100644 index 1c76c572a4..0000000000 --- a/bench/HalfBench.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "Benchmark.h" -#include "SkOpts.h" -#include "SkRandom.h" - -struct FloatToHalfBench : public Benchmark { - const char* onGetName() override { return "float_to_half"; } - bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } - - void onDraw(int loops, SkCanvas* canvas) override { - SkRandom rand; - float fs[1023]; - for (float& f : fs) { - f = rand.nextF(); - } - - uint16_t hs[1023]; - while (loops --> 0) { - SkOpts::float_to_half(hs, fs, 1023); - } - } -}; -DEF_BENCH(return new FloatToHalfBench;) - -struct HalfToFloatBench : public Benchmark { - const char* onGetName() override { return "half_to_float"; } - bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } - - void onDraw(int loops, SkCanvas* canvas) override { - SkRandom rand; - uint16_t hs[1023]; - for (uint16_t& h : hs) { - h = rand.nextU16(); - } - - float fs[1023]; - while (loops --> 0) { - SkOpts::half_to_float(fs, hs, 1023); - } - } -}; -DEF_BENCH(return new HalfToFloatBench;) diff --git a/src/core/SkOpts.cpp b/src/core/SkOpts.cpp index be716a9bd3..bc9ec536ac 100644 --- a/src/core/SkOpts.cpp +++ b/src/core/SkOpts.cpp @@ -33,19 +33,6 @@ #include "SkTextureCompressor_opts.h" #include "SkXfermode_opts.h" -namespace SK_OPTS_NS { - static void float_to_half(uint16_t dst[], const float src[], int n) { - while (n-->0) { - *dst++ = SkFloatToHalf(*src++); - } - } - static void half_to_float(float dst[], const uint16_t src[], int n) { - while (n-->0) { - *dst++ = SkHalfToFloat(*src++); - } - } -} - namespace SkOpts { // Define default function pointer values here... // If our global compile options are set high enough, these defaults might even be @@ -83,9 +70,6 @@ namespace SkOpts { DEFINE_DEFAULT(inverted_CMYK_to_RGB1); DEFINE_DEFAULT(inverted_CMYK_to_BGR1); - DEFINE_DEFAULT(half_to_float); - DEFINE_DEFAULT(float_to_half); - DEFINE_DEFAULT(srcover_srgb_srgb); DEFINE_DEFAULT(color_xform_RGB1_to_2dot2); diff --git a/src/core/SkOpts.h b/src/core/SkOpts.h index f551bf453c..2bf4bdabde 100644 --- a/src/core/SkOpts.h +++ b/src/core/SkOpts.h @@ -62,9 +62,6 @@ namespace SkOpts { inverted_CMYK_to_RGB1, // i.e. convert color space inverted_CMYK_to_BGR1; // i.e. convert color space - extern void (*half_to_float)(float[], const uint16_t[], int); - extern void (*float_to_half)(uint16_t[], const float[], int); - // Blend ndst src pixels over dst, where both src and dst point to sRGB pixels (RGBA or BGRA). // If nsrc < ndst, we loop over src to create a pattern. extern void (*srcover_srgb_srgb)(uint32_t* dst, const uint32_t* src, int ndst, int nsrc); diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp index d80fe29439..cc5efedae6 100644 --- a/tests/Float16Test.cpp +++ b/tests/Float16Test.cpp @@ -55,19 +55,6 @@ DEF_TEST(color_half_float, reporter) { } } -DEF_TEST(float_to_half, reporter) { - const float fs[] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0 }; - const uint16_t hs[] = { 0x3c00, 0x4000, 0x4200, 0x4400, 0x4500, 0x4600, 0x4700 }; - - uint16_t hscratch[7]; - SkOpts::float_to_half(hscratch, fs, 7); - REPORTER_ASSERT(reporter, 0 == memcmp(hscratch, hs, sizeof(hs))); - - float fscratch[7]; - SkOpts::half_to_float(fscratch, hs, 7); - REPORTER_ASSERT(reporter, 0 == memcmp(fscratch, fs, sizeof(fs))); -} - static uint32_t u(float f) { uint32_t x; memcpy(&x, &f, 4); |