commit f83c4684a602dc0b2e81e4fafce88a3a5617cad6
author Robert Phillips <robertphillips@google.com> Thu Jun 13 16:49:21 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 13 16:49:31 2019 +0000
tree c3f8cec6050361f67a7e1d7fc8bc4226759ed6ec
parent 569f12f0e50368b03f7316e1fb48b05e2e91117c

Revert "Add Ganesh support for RGBA_16161616 and RG_half"

This reverts commit 156622513ffc385bb493eda8d4cf5cbed19350d1.

Reason for revert: valgrind

Original change's description:
> Add Ganesh support for RGBA_16161616 and RG_half
> 
> Change-Id: Ia424ff719c5fb8d1842a909ade09ad6f5f78f21f
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/219998
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>

TBR=egdaniel@google.com,robertphillips@google.com

Change-Id: I7a8e99e70f575fb301ce289d9a04ebbec25b934b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/220739
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrDataUtils.cpp

diff --git a/src/gpu/GrDataUtils.cpp b/src/gpu/GrDataUtils.cpp
index 63418a0..965251e 100644
--- a/src/gpu/GrDataUtils.cpp
+++ b/src/gpu/GrDataUtils.cpp
@@ -262,6 +262,7 @@
             sk_memset64((uint64_t *) dest, rgbaHalf, width * height);
             break;
         }
+        // Experimental (for P016 and P010)
         case kR_16_GrPixelConfig: {
             uint16_t r16 = SkScalarRoundToInt(colorf.fR * 65535.0f);
             sk_memset16((uint16_t*) dest, r16, width * height);
@@ -276,26 +277,6 @@
             sk_memset32((uint32_t*) dest, rg1616, width * height);
             break;
         }
-        // Experimental (for Y416 and mutant P016/P010)
-        case kRGBA_16161616_GrPixelConfig: {
-            uint64_t r16 = SkScalarRoundToInt(colorf.fR * 65535.0f);
-            uint64_t g16 = SkScalarRoundToInt(colorf.fG * 65535.0f);
-            uint64_t b16 = SkScalarRoundToInt(colorf.fB * 65535.0f);
-            uint64_t a16 = SkScalarRoundToInt(colorf.fA * 65535.0f);
-
-            uint64_t rgba16161616 = (a16 << 48) | (b16 << 32) | (g16 << 16) | r16;
-            sk_memset64((uint64_t*) dest, rgba16161616, width * height);
-            break;
-        }
-        case kRG_half_GrPixelConfig: {
-            uint32_t rHalf = SkFloatToHalf(colorf.fR);
-            uint32_t gHalf = SkFloatToHalf(colorf.fG);
-
-            uint32_t rgHalf = (rHalf << 16) | gHalf;
-
-            sk_memset32((uint32_t *) dest, rgHalf, width * height);
-            break;
-        }
         default:
             return false;
             break;