aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/glsl
diff options
context:
space:
mode:
authorGravatar Chris Dalton <csmartdalton@google.com>2017-10-24 19:53:13 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-10-24 19:53:23 +0000
commit6dd0d8a2659d5976fdd2b6528f787ac7f0b0005b (patch)
treec2b5536c6ecae3934ed74ce93f9ddd41b3daf3ba /src/gpu/glsl
parentaf37a53a84d03fa08bc2f447034d7db754cfc5ba (diff)
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>
Diffstat (limited to 'src/gpu/glsl')
-rw-r--r--src/gpu/glsl/GrGLSL.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gpu/glsl/GrGLSL.cpp b/src/gpu/glsl/GrGLSL.cpp
index 994a8372a7..6067fa65af 100644
--- a/src/gpu/glsl/GrGLSL.cpp
+++ b/src/gpu/glsl/GrGLSL.cpp
@@ -89,20 +89,8 @@ const char* GrGLSLTypeString(const GrShaderCaps* shaderCaps, GrSLType t) {
return "uint";
case kShort_GrSLType:
return "short";
- case kShort2_GrSLType:
- return "short2";
- case kShort3_GrSLType:
- return "short3";
- case kShort4_GrSLType:
- return "short4";
case kUShort_GrSLType:
return "ushort";
- case kUShort2_GrSLType:
- return "ushort2";
- case kUShort3_GrSLType:
- return "ushort3";
- case kUShort4_GrSLType:
- return "ushort4";
case kTexture2D_GrSLType:
return "texture2D";
case kSampler_GrSLType: