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

diff --git a/bench/HalfBench.cpp b/bench/HalfBench.cpp
deleted file mode 100644 (file)
index 1c76c57..0000000
--- 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 be716a9bd38db6f0492995ea5e983d9d8cf01f45..bc9ec536ac41c279412649bb8d98e120422e495c 100644 (file)
--- 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 f551bf453c385e1aa09e7a700ad3d2c2ac1ccd22..2bf4bdabde47de1f51a2c537d3294c13c127e35f 100644 (file)
--- 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 d80fe29439864366a57076b3baeeb7488bab7147..cc5efedae66faae78932767cae07d0ec5ebf146e 100644 (file)
--- 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);