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

This reverts commit 05d5a13fea6246648de7e41358ed338d53c85ea2.

Reason for revert: looks like it broke filterfastbounds

Original change's description:
> Revert "Revert "Switched highp float to highfloat and mediump float to half.""
> 
> This reverts commit 1d816b92bb7cf2258007f3f74ffd143b89f25d01.
> 
> Bug: skia:
> Change-Id: I388b5e5e9bf619db48297a80c9a80c039f26c9f1
> Reviewed-on: https://skia-review.googlesource.com/46464
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

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

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:
Change-Id: Iddf6aef2ab084aa73da7ceebdfc303a1d2b80cde
Reviewed-on: https://skia-review.googlesource.com/47441
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

1 files changed, 23 insertions, 41 deletions

diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index abd4b086ae..98a27518a3 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -16,40 +16,31 @@
 // 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 kUint2_GrSLType:
+        case kVec2us_GrSLType:
             return 0x3;
-        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.
@@ -75,41 +66,32 @@ 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 kUint2_GrSLType:
+        case kVec2us_GrSLType:
             return 2 * sizeof(uint16_t);
-        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.
@@ -140,7 +122,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;