summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mat M2020-04-15 11:43:52 -0400
committerGravatar GitHub2020-04-15 11:43:52 -0400
commit9208d555b79990d0fdcc2d727a32f09e33769193 (patch)
tree91ac3138f0e5b90f5dd964f01bef5e39e8d52ce6
parentMerge pull request #3656 from ReinUsesLisp/glsl-full-decompile (diff)
parentmaxwell_to_vk: Add uint16 vertex formats (diff)
downloadyuzu-9208d555b79990d0fdcc2d727a32f09e33769193.tar.gz
yuzu-9208d555b79990d0fdcc2d727a32f09e33769193.tar.xz
yuzu-9208d555b79990d0fdcc2d727a32f09e33769193.zip
Merge pull request #3668 from ReinUsesLisp/vtx-format-16ui
maxwell_to_vk: Add uint16 vertex formats
-rw-r--r--src/video_core/renderer_vulkan/maxwell_to_vk.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp
index 143478863..8681b821f 100644
--- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp
+++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp
@@ -360,6 +360,7 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib
360 default: 360 default:
361 break; 361 break;
362 } 362 }
363 break;
363 case Maxwell::VertexAttribute::Type::UnsignedInt: 364 case Maxwell::VertexAttribute::Type::UnsignedInt:
364 switch (size) { 365 switch (size) {
365 case Maxwell::VertexAttribute::Size::Size_8: 366 case Maxwell::VertexAttribute::Size::Size_8:
@@ -370,6 +371,14 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib
370 return VK_FORMAT_R8G8B8_UINT; 371 return VK_FORMAT_R8G8B8_UINT;
371 case Maxwell::VertexAttribute::Size::Size_8_8_8_8: 372 case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
372 return VK_FORMAT_R8G8B8A8_UINT; 373 return VK_FORMAT_R8G8B8A8_UINT;
374 case Maxwell::VertexAttribute::Size::Size_16:
375 return VK_FORMAT_R16_UINT;
376 case Maxwell::VertexAttribute::Size::Size_16_16:
377 return VK_FORMAT_R16G16_UINT;
378 case Maxwell::VertexAttribute::Size::Size_16_16_16:
379 return VK_FORMAT_R16G16B16_UINT;
380 case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
381 return VK_FORMAT_R16G16B16A16_UINT;
373 case Maxwell::VertexAttribute::Size::Size_32: 382 case Maxwell::VertexAttribute::Size::Size_32:
374 return VK_FORMAT_R32_UINT; 383 return VK_FORMAT_R32_UINT;
375 case Maxwell::VertexAttribute::Size::Size_32_32: 384 case Maxwell::VertexAttribute::Size::Size_32_32:
@@ -381,6 +390,7 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib
381 default: 390 default:
382 break; 391 break;
383 } 392 }
393 break;
384 case Maxwell::VertexAttribute::Type::UnsignedScaled: 394 case Maxwell::VertexAttribute::Type::UnsignedScaled:
385 switch (size) { 395 switch (size) {
386 case Maxwell::VertexAttribute::Size::Size_8: 396 case Maxwell::VertexAttribute::Size::Size_8: