diff options
author | Chris Dalton <csmartdalton@google.com> | 2017-10-24 19:53:13 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-24 19:53:23 +0000 |
commit | 6dd0d8a2659d5976fdd2b6528f787ac7f0b0005b (patch) | |
tree | c2b5536c6ecae3934ed74ce93f9ddd41b3daf3ba /src/gpu/vk/GrVkVaryingHandler.cpp | |
parent | af37a53a84d03fa08bc2f447034d7db754cfc5ba (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/vk/GrVkVaryingHandler.cpp')
-rw-r--r-- | src/gpu/vk/GrVkVaryingHandler.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp index ff56a39ce1..21c97717b3 100644 --- a/src/gpu/vk/GrVkVaryingHandler.cpp +++ b/src/gpu/vk/GrVkVaryingHandler.cpp @@ -28,16 +28,10 @@ static inline int grsltype_to_location_size(GrSLType type) { case kUint2_GrSLType: return 1; case kInt2_GrSLType: - case kShort2_GrSLType: - case kUShort2_GrSLType: return 1; case kInt3_GrSLType: - case kShort3_GrSLType: - case kUShort3_GrSLType: return 1; case kInt4_GrSLType: - case kShort4_GrSLType: - case kUShort4_GrSLType: return 1; case kFloat2x2_GrSLType: case kHalf2x2_GrSLType: |