AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unsigned short UVs for Vulkan.

Browse Source 
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
This commit is contained in:
jvanverth 2016-02-22 13:05:51 -08:00 committed by Commit bot
parent 3d7b02c728
commit f853594cc1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/vk/GrVkPipeline.cpp
View File

@ -24,7 +24,7 @@ static inline const VkFormat& attrib_type_to_vkformat(GrVertexAttribType type) {
VK_FORMAT_R32G32B32A32_SFLOAT, // kVec4f_GrVertexAttribType VK_FORMAT_R32G32B32A32_SFLOAT, // kVec4f_GrVertexAttribType
VK_FORMAT_R8_UNORM, // kUByte_GrVertexAttribType VK_FORMAT_R8_UNORM, // kUByte_GrVertexAttribType
VK_FORMAT_R8G8B8A8_UNORM, // kVec4ub_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(0 == kFloat_GrVertexAttribType);
GR_STATIC_ASSERT(1 == kVec2f_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(3 == kVec4f_GrVertexAttribType);
GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType); GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType);
GR_STATIC_ASSERT(5 == kVec4ub_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); GR_STATIC_ASSERT(SK_ARRAY_COUNT(kFormats) == kGrVertexAttribTypeCount);
return kFormats[type]; return kFormats[type];
} }