Revert "Switched highp float to highfloat and mediump float to half."

This reverts commit 88d99c63878c2d3d340120f0321676f72afcb4f0.

Reason for revert: Believed to be causing unit test failures in Chrome roll:

https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/364433
https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Ftryserver.chromium.android%2Flinux_android_rel_ng%2F364433%2F%2B%2Frecipes%2Fsteps%2Fcontent_browsertests__with_patch__on_Android%2F0%2Flogs%2FWebRtcCaptureFromElementBrowserTest.VerifyCanvasWebGLCaptureColor%2F0

Original change's description:
> Switched highp float to highfloat and mediump float to half.
> 
> The ultimate goal is to end up with "float" and "half", but this
> intermediate step uses "highfloat" so that it is clear if I missed a
> "float" somewhere. Once this lands, a subsequent CL will switch all
> "highfloats" back to "floats".
> 
> Bug: skia:
> Change-Id: Ia13225c7a0a0a2901e07665891c473d2500ddcca
> Reviewed-on: https://skia-review.googlesource.com/31000
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com,ethannicholas@google.com

Change-Id: I8bfa97547ac3920d433665f161d27df3f15c83aa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/35705
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

1 files changed, 11 insertions, 20 deletions

diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp
index 5232399dbd..8e43b76341 100644
--- a/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -13,32 +13,25 @@ static inline int grsltype_to_location_size(GrSLType type) {
     switch(type) {
         case kVoid_GrSLType:
             return 0;
-        case kHighFloat_GrSLType: // fall through
-        case kHalf_GrSLType:
+        case kFloat_GrSLType:
             return 1;
-        case kHighFloat2_GrSLType: // fall through
-        case kHalf2_GrSLType:
+        case kVec2f_GrSLType:
             return 1;
-        case kHighFloat3_GrSLType:
-        case kHalf3_GrSLType:
+        case kVec3f_GrSLType:
             return 1;
-        case kHighFloat4_GrSLType:
-        case kHalf4_GrSLType:
+        case kVec4f_GrSLType:
             return 1;
-        case kInt2_GrSLType:
+        case kVec2i_GrSLType:
             return 1;
-        case kInt3_GrSLType:
+        case kVec3i_GrSLType:
             return 1;
-        case kInt4_GrSLType:
+        case kVec4i_GrSLType:
             return 1;
-        case kHighFloat2x2_GrSLType:
-        case kHalf2x2_GrSLType:
+        case kMat22f_GrSLType:
             return 2;
-        case kHighFloat3x3_GrSLType:
-        case kHalf3x3_GrSLType:
+        case kMat33f_GrSLType:
             return 3;
-        case kHighFloat4x4_GrSLType:
-        case kHalf4x4_GrSLType:
+        case kMat44f_GrSLType:
             return 4;
         case kTexture2DSampler_GrSLType:
             return 0;
@@ -52,11 +45,9 @@ static inline int grsltype_to_location_size(GrSLType type) {
              return 0;
         case kBool_GrSLType:
              return 1;
-        case kInt_GrSLType: // fall through
-        case kShort_GrSLType:
+        case kInt_GrSLType:
              return 1;
         case kUint_GrSLType:
-        case kUShort_GrSLType: // fall through
              return 1;
         case kTexture2D_GrSLType:
              return 0;