Revert "Add vector GrSLTypes for shorts"

This reverts commit af37a53a84d03fa08bc2f447034d7db754cfc5ba.

Reason for revert: Compiler errors

Original change's description:
> Add vector GrSLTypes for shorts
> 
> Bug: skia:
> Change-Id: Icb9eb1fcb0f879cd0bfdd27d06459843361c9947
> Reviewed-on: https://skia-review.googlesource.com/62943
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

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

Change-Id: Ib23b28be92e199459fe1666fb1ec0e46e141a8f7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/63460
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

1 files changed, 1 insertions, 43 deletions

diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h
index fa7a4d97e5..2b014114f1 100644
--- a/include/private/GrTypesPriv.h
+++ b/include/private/GrTypesPriv.h
@@ -110,13 +110,7 @@ enum GrSLType {
     kVoid_GrSLType,
     kBool_GrSLType,
     kShort_GrSLType,
-    kShort2_GrSLType,
-    kShort3_GrSLType,
-    kShort4_GrSLType,
     kUShort_GrSLType,
-    kUShort2_GrSLType,
-    kUShort3_GrSLType,
-    kUShort4_GrSLType,
     kFloat_GrSLType,
     kFloat2_GrSLType,
     kFloat3_GrSLType,
@@ -214,13 +208,7 @@ static inline bool GrSLTypeIsFloatType(GrSLType type) {
         case kBufferSampler_GrSLType:
         case kBool_GrSLType:
         case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
         case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
         case kInt_GrSLType:
         case kInt2_GrSLType:
         case kInt3_GrSLType:
@@ -269,13 +257,7 @@ static inline bool GrSLTypeIs2DCombinedSamplerType(GrSLType type) {
         case kBufferSampler_GrSLType:
         case kBool_GrSLType:
         case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
         case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
         case kImageStorage2D_GrSLType:
@@ -318,13 +300,7 @@ static inline bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
         case kUint2_GrSLType:
         case kBool_GrSLType:
         case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
         case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
         case kImageStorage2D_GrSLType:
@@ -364,13 +340,7 @@ static inline bool GrSLTypeIsImageStorage(GrSLType type) {
         case kUint2_GrSLType:
         case kBool_GrSLType:
         case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
         case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
         case kTexture2DSampler_GrSLType:
@@ -400,13 +370,7 @@ static inline bool GrSLTypeAcceptsPrecision(GrSLType type) {
         case kVoid_GrSLType:
         case kBool_GrSLType:
         case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
         case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
         case kFloat_GrSLType:
         case kFloat2_GrSLType:
         case kFloat3_GrSLType:
@@ -472,12 +436,6 @@ static inline bool GrSLTypeTemporarilyAcceptsPrecision(GrSLType type) {
 
         case kVoid_GrSLType:
         case kBool_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
             return false;
     }
     SK_ABORT("Unexpected type");
@@ -568,7 +526,7 @@ static inline GrSLType GrVertexAttribTypeToSLType(GrVertexAttribType type) {
         case kUShort2_norm_GrVertexAttribType: // fall through
             return kFloat2_GrSLType;
         case kUShort2_GrVertexAttribType:
-            return kUShort2_GrSLType;
+            return kUint2_GrSLType;
         case kUByte_norm_GrVertexAttribType:   // fall through
         case kFloat_GrVertexAttribType:
             return kFloat_GrSLType;