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, 21 insertions, 39 deletions

diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index 6a38506920..be746cd653 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -16,38 +16,29 @@
 // aligned to 16 bytes (i.e. has mask of 0xF).
 uint32_t grsltype_to_alignment_mask(GrSLType type) {
     switch(type) {
-        case kShort_GrSLType: // fall through
         case kInt_GrSLType:
             return 0x3;
-        case kUShort_GrSLType: // fall through
         case kUint_GrSLType:
             return 0x3;
-        case kHalf_GrSLType: // fall through
-        case kHighFloat_GrSLType:
+        case kFloat_GrSLType:
             return 0x3;
-        case kHalf2_GrSLType: // fall through
-        case kHighFloat2_GrSLType:
+        case kVec2f_GrSLType:
             return 0x7;
-        case kHalf3_GrSLType: // fall through
-        case kHighFloat3_GrSLType:
+        case kVec3f_GrSLType:
             return 0xF;
-        case kHalf4_GrSLType: // fall through
-        case kHighFloat4_GrSLType:
+        case kVec4f_GrSLType:
             return 0xF;
-        case kInt2_GrSLType:
+        case kVec2i_GrSLType:
             return 0x7;
-        case kInt3_GrSLType:
+        case kVec3i_GrSLType:
             return 0xF;
-        case kInt4_GrSLType:
+        case kVec4i_GrSLType:
             return 0xF;
-        case kHalf2x2_GrSLType: // fall through
-        case kHighFloat2x2_GrSLType:
+        case kMat22f_GrSLType:
             return 0x7;
-        case kHalf3x3_GrSLType: // fall through
-        case kHighFloat3x3_GrSLType:
+        case kMat33f_GrSLType:
             return 0xF;
-        case kHalf4x4_GrSLType: // fall through
-        case kHighFloat4x4_GrSLType:
+        case kMat44f_GrSLType:
             return 0xF;
 
         // This query is only valid for certain types.
@@ -73,39 +64,30 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
     so a float2x2 takes up 8 floats. */
 static inline uint32_t grsltype_to_vk_size(GrSLType type) {
     switch(type) {
-        case kShort_GrSLType: // fall through
         case kInt_GrSLType:
             return sizeof(int32_t);
-        case kUShort_GrSLType: // fall through
         case kUint_GrSLType:
             return sizeof(int32_t);
-        case kHalf_GrSLType: // fall through
-        case kHighFloat_GrSLType:
+        case kFloat_GrSLType:
             return sizeof(float);
-        case kHalf2_GrSLType: // fall through
-        case kHighFloat2_GrSLType:
+        case kVec2f_GrSLType:
             return 2 * sizeof(float);
-        case kHalf3_GrSLType: // fall through
-        case kHighFloat3_GrSLType:
+        case kVec3f_GrSLType:
             return 3 * sizeof(float);
-        case kHalf4_GrSLType: // fall through
-        case kHighFloat4_GrSLType:
+        case kVec4f_GrSLType:
             return 4 * sizeof(float);
-        case kInt2_GrSLType:
+        case kVec2i_GrSLType:
             return 2 * sizeof(int32_t);
-        case kInt3_GrSLType:
+        case kVec3i_GrSLType:
             return 3 * sizeof(int32_t);
-        case kInt4_GrSLType:
+        case kVec4i_GrSLType:
             return 4 * sizeof(int32_t);
-        case kHalf2x2_GrSLType: // fall through
-        case kHighFloat2x2_GrSLType:
+        case kMat22f_GrSLType:
             //TODO: this will be 4 * szof(float) on std430.
             return 8 * sizeof(float);
-        case kHalf3x3_GrSLType: // fall through
-        case kHighFloat3x3_GrSLType:
+        case kMat33f_GrSLType:
             return 12 * sizeof(float);
-        case kHalf4x4_GrSLType: // fall through
-        case kHighFloat4x4_GrSLType:
+        case kMat44f_GrSLType:
             return 16 * sizeof(float);
 
         // This query is only valid for certain types.
@@ -136,7 +118,7 @@ void get_ubo_aligned_offset(uint32_t* uniformOffset,
                             int arrayCount) {
     uint32_t alignmentMask = grsltype_to_alignment_mask(type);
     // We want to use the std140 layout here, so we must make arrays align to 16 bytes.
-    if (arrayCount || type == kHighFloat2x2_GrSLType) {
+    if (arrayCount || type == kMat22f_GrSLType) {
         alignmentMask = 0xF;
     }
     uint32_t offsetDiff = *currentOffset & alignmentMask;