aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/vk
diff options
context:
space:
mode:
authorGravatar Chris Dalton <csmartdalton@google.com>2017-10-24 13:22:10 -0600
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-10-25 15:44:05 +0000
commita045eea29eb79254248d7e2666825a1ca7d23d4e (patch)
tree4a0a55d8476a100c1fa5b54ca5212a02723a148f /src/gpu/vk
parentd204eb80abb0172b024664cf9f05d66d15574a24 (diff)
CCPR: use 16-bit ints for the atlas offset attrib
Bug: skia: Change-Id: I053e8416ced317b6ebc46cc8189840d60c7f91e8 Reviewed-on: https://skia-review.googlesource.com/62060 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/vk')
-rw-r--r--src/gpu/vk/GrVkPipeline.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/vk/GrVkPipeline.cpp
index ba64532c4e..a247078f72 100644
--- a/src/gpu/vk/GrVkPipeline.cpp
+++ b/src/gpu/vk/GrVkPipeline.cpp
@@ -38,10 +38,12 @@ static inline VkFormat attrib_type_to_vkformat(GrVertexAttribType type) {
return VK_FORMAT_R8_UNORM;
case kUByte4_norm_GrVertexAttribType:
return VK_FORMAT_R8G8B8A8_UNORM;
- case kUShort2_norm_GrVertexAttribType:
- return VK_FORMAT_R16G16_UNORM;
+ case kShort2_GrVertexAttribType:
+ return VK_FORMAT_R16G16_SINT;
case kUShort2_GrVertexAttribType:
return VK_FORMAT_R16G16_UINT;
+ case kUShort2_norm_GrVertexAttribType:
+ return VK_FORMAT_R16G16_UNORM;
case kInt_GrVertexAttribType:
return VK_FORMAT_R32_SINT;
case kUint_GrVertexAttribType: