commit f7b8820dc813d1eb0b6b43fe4581dded0da38caf
author Ethan Nicholas <ethannicholas@google.com> Mon Sep 18 14:10:39 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 18 18:32:13 2017 +0000
tree 518d313a9fa571a9f9ca26af7c381664694a4706
parent 47a540f503bc722393b61c4b822e95b17f200125

re-land of new SkSL precisions

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

src/gpu/vk/GrVkVaryingHandler.cpp

diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp
index 5912098..887a422 100644
--- a/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -13,27 +13,34 @@
     switch(type) {
         case kVoid_GrSLType:
             return 0;
-        case kFloat_GrSLType:
+        case kHighFloat_GrSLType: // fall through
+        case kHalf_GrSLType:
             return 1;
-        case kVec2f_GrSLType:
+        case kHighFloat2_GrSLType: // fall through
+        case kHalf2_GrSLType:
             return 1;
-        case kVec3f_GrSLType:
+        case kHighFloat3_GrSLType:
+        case kHalf3_GrSLType:
             return 1;
-        case kVec4f_GrSLType:
+        case kHighFloat4_GrSLType:
+        case kHalf4_GrSLType:
             return 1;
-        case kVec2us_GrSLType:
+        case kUint2_GrSLType:
             return 1;
-        case kVec2i_GrSLType:
+        case kInt2_GrSLType:
             return 1;
-        case kVec3i_GrSLType:
+        case kInt3_GrSLType:
             return 1;
-        case kVec4i_GrSLType:
+        case kInt4_GrSLType:
             return 1;
-        case kMat22f_GrSLType:
+        case kHighFloat2x2_GrSLType:
+        case kHalf2x2_GrSLType:
             return 2;
-        case kMat33f_GrSLType:
+        case kHighFloat3x3_GrSLType:
+        case kHalf3x3_GrSLType:
             return 3;
-        case kMat44f_GrSLType:
+        case kHighFloat4x4_GrSLType:
+        case kHalf4x4_GrSLType:
             return 4;
         case kTexture2DSampler_GrSLType:
             return 0;
@@ -47,9 +54,11 @@
              return 0;
         case kBool_GrSLType:
              return 1;
-        case kInt_GrSLType:
+        case kInt_GrSLType: // fall through
+        case kShort_GrSLType:
              return 1;
         case kUint_GrSLType:
+        case kUShort_GrSLType: // fall through
              return 1;
         case kTexture2D_GrSLType:
              return 0;