Fix unsigned short UVs for Vulkan.

src/gpu/vk/GrVkPipeline.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "GrVkPipeline.h"
 
 #include "GrGeometryProcessor.h"
 #include "GrPipeline.h"
 
 #include "GrVkGpu.h"
 #include "GrVkProgramDesc.h"
 #include "GrVkRenderTarget.h"
 #include "GrVkUtil.h"
 
 static inline const VkFormat& attrib_type_to_vkformat(GrVertexAttribType type) {
     SkASSERT(type >= 0 && type < kGrVertexAttribTypeCount);
     static const VkFormat kFormats[kGrVertexAttribTypeCount] = {
         VK_FORMAT_R32_SFLOAT,          // kFloat_GrVertexAttribType
         VK_FORMAT_R32G32_SFLOAT,       // kVec2f_GrVertexAttribType
         VK_FORMAT_R32G32B32_SFLOAT,    // kVec3f_GrVertexAttribType
         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);
     GR_STATIC_ASSERT(2 == kVec3f_GrVertexAttribType);
     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];
 }
 
 static void setup_vertex_input_state(const GrPrimitiveProcessor& primProc,
                                      VkPipelineVertexInputStateCreateInfo* vertexInputInfo,
                                      VkVertexInputBindingDescription* bindingDesc,
                                      int maxBindingDescCount,
                                      VkVertexInputAttributeDescription* attributeDesc,
                                      int maxAttributeDescCount) {
@@ skipping 452 matching lines @@
     }
 
     return new GrVkPipeline(vkPipeline);
 }
 
 void GrVkPipeline::freeGPUData(const GrVkGpu* gpu) const {
     GR_VK_CALL(gpu->vkInterface(), DestroyPipeline(gpu->device(), fPipeline, nullptr));
 }