aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/vk/GrVkUniformHandler.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-08-24 17:47:23 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-24 17:56:30 +0000
commite253831ee0f3f85c5143e5ac39325400b145106f (patch)
tree84c13b8a445992289e0b2ca6c7335a9315e892f2 /src/gpu/vk/GrVkUniformHandler.cpp
parent01a6a619d96d4b396d6f911722ffae862acdcbe6 (diff)
Revert "Switch atlas clients over to using absolute texture coordinates"
This reverts commit e84c087e621978e6d298b8ca950521601a0366cb. Reason for revert: ANGLE is unhappy Original change's description: > Switch atlas clients over to using absolute texture coordinates > > This is a prerequisite for being able to resize the atlas with impunity. > > Change-Id: I509816c8d6f38fbc92fa39aeab303b42ab09f58b > Reviewed-on: https://skia-review.googlesource.com/37560 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,jvanverth@google.com,robertphillips@google.com,brianosman@google.com Change-Id: I329efd642c22e11a5c576a4632fc557759b200d5 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/38400 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkUniformHandler.cpp')
-rw-r--r--src/gpu/vk/GrVkUniformHandler.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index 98a27518a3..be746cd653 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -28,8 +28,6 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) {
return 0xF;
case kVec4f_GrSLType:
return 0xF;
- case kVec2us_GrSLType:
- return 0x3;
case kVec2i_GrSLType:
return 0x7;
case kVec3i_GrSLType:
@@ -78,8 +76,6 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) {
return 3 * sizeof(float);
case kVec4f_GrSLType:
return 4 * sizeof(float);
- case kVec2us_GrSLType:
- return 2 * sizeof(uint16_t);
case kVec2i_GrSLType:
return 2 * sizeof(int32_t);
case kVec3i_GrSLType: