From f853594cc10993e618a5ec80693e01e0e05af536 Mon Sep 17 00:00:00 2001 From: jvanverth Date: Mon, 22 Feb 2016 13:05:51 -0800 Subject: [PATCH] Fix unsigned short UVs for Vulkan. Modifies the attribute type to match GL. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1723633003 Review URL: https://codereview.chromium.org/1723633003 --- src/gpu/vk/GrVkPipeline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/vk/GrVkPipeline.cpp index 520cb1b44d..f009eaf548 100644 --- a/src/gpu/vk/GrVkPipeline.cpp +++ b/src/gpu/vk/GrVkPipeline.cpp @@ -24,7 +24,7 @@ static inline const VkFormat& attrib_type_to_vkformat(GrVertexAttribType type) { VK_FORMAT_R32G32B32A32_SFLOAT, // kVec4f_GrVertexAttribType VK_FORMAT_R8_UNORM, // kUByte_GrVertexAttribType VK_FORMAT_R8G8B8A8_UNORM, // kVec4ub_GrVertexAttribType - VK_FORMAT_R16G16_SSCALED, // kVec2s_GrVertexAttribType + VK_FORMAT_R16G16_UNORM, // kVec2us_GrVertexAttribType }; GR_STATIC_ASSERT(0 == kFloat_GrVertexAttribType); GR_STATIC_ASSERT(1 == kVec2f_GrVertexAttribType); @@ -32,7 +32,7 @@ static inline const VkFormat& attrib_type_to_vkformat(GrVertexAttribType type) { GR_STATIC_ASSERT(3 == kVec4f_GrVertexAttribType); GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType); GR_STATIC_ASSERT(5 == kVec4ub_GrVertexAttribType); - GR_STATIC_ASSERT(6 == kVec2s_GrVertexAttribType); + GR_STATIC_ASSERT(6 == kVec2us_GrVertexAttribType); GR_STATIC_ASSERT(SK_ARRAY_COUNT(kFormats) == kGrVertexAttribTypeCount); return kFormats[type]; }