diff options
| author | 2020-09-16 17:48:01 -0300 | |
|---|---|---|
| committer | 2020-09-16 17:48:01 -0300 | |
| commit | eb914b6c50cbd79cdc76a508ab774e54e34c9b11 (patch) | |
| tree | cba7d92a8b7250e0afd889057b08149a352ca91a /src/video_core/renderer_vulkan | |
| parent | Merge pull request #4661 from lioncash/system-loader (diff) | |
| download | yuzu-eb914b6c50cbd79cdc76a508ab774e54e34c9b11.tar.gz yuzu-eb914b6c50cbd79cdc76a508ab774e54e34c9b11.tar.xz yuzu-eb914b6c50cbd79cdc76a508ab774e54e34c9b11.zip | |
video_core: Enforce -Werror=switch
This forces us to fix all -Wswitch warnings in video_core.
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/maxwell_to_vk.cpp | 24 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/wrapper.cpp | 16 |
2 files changed, 36 insertions, 4 deletions
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index f8c77f4fa..d22de1d81 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp | |||
| @@ -78,9 +78,10 @@ VkSamplerAddressMode WrapMode(const VKDevice& device, Tegra::Texture::WrapMode w | |||
| 78 | case Tegra::Texture::WrapMode::MirrorOnceBorder: | 78 | case Tegra::Texture::WrapMode::MirrorOnceBorder: |
| 79 | UNIMPLEMENTED(); | 79 | UNIMPLEMENTED(); |
| 80 | return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; | 80 | return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; |
| 81 | default: | ||
| 82 | UNIMPLEMENTED_MSG("Unimplemented wrap mode={}", static_cast<u32>(wrap_mode)); | ||
| 83 | return {}; | ||
| 81 | } | 84 | } |
| 82 | UNIMPLEMENTED_MSG("Unimplemented wrap mode={}", static_cast<u32>(wrap_mode)); | ||
| 83 | return {}; | ||
| 84 | } | 85 | } |
| 85 | 86 | ||
| 86 | VkCompareOp DepthCompareFunction(Tegra::Texture::DepthCompareFunc depth_compare_func) { | 87 | VkCompareOp DepthCompareFunction(Tegra::Texture::DepthCompareFunc depth_compare_func) { |
| @@ -298,9 +299,10 @@ VkPrimitiveTopology PrimitiveTopology([[maybe_unused]] const VKDevice& device, | |||
| 298 | return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; | 299 | return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; |
| 299 | case Maxwell::PrimitiveTopology::Patches: | 300 | case Maxwell::PrimitiveTopology::Patches: |
| 300 | return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; | 301 | return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; |
| 302 | default: | ||
| 303 | UNIMPLEMENTED_MSG("Unimplemented topology={}", static_cast<u32>(topology)); | ||
| 304 | return {}; | ||
| 301 | } | 305 | } |
| 302 | UNIMPLEMENTED_MSG("Unimplemented topology={}", static_cast<u32>(topology)); | ||
| 303 | return {}; | ||
| 304 | } | 306 | } |
| 305 | 307 | ||
| 306 | VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttribute::Size size) { | 308 | VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttribute::Size size) { |
| @@ -325,6 +327,8 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib | |||
| 325 | return VK_FORMAT_R16G16B16A16_UNORM; | 327 | return VK_FORMAT_R16G16B16A16_UNORM; |
| 326 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | 328 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: |
| 327 | return VK_FORMAT_A2B10G10R10_UNORM_PACK32; | 329 | return VK_FORMAT_A2B10G10R10_UNORM_PACK32; |
| 330 | default: | ||
| 331 | break; | ||
| 328 | } | 332 | } |
| 329 | break; | 333 | break; |
| 330 | case Maxwell::VertexAttribute::Type::SignedNorm: | 334 | case Maxwell::VertexAttribute::Type::SignedNorm: |
| @@ -347,6 +351,8 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib | |||
| 347 | return VK_FORMAT_R16G16B16A16_SNORM; | 351 | return VK_FORMAT_R16G16B16A16_SNORM; |
| 348 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | 352 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: |
| 349 | return VK_FORMAT_A2B10G10R10_SNORM_PACK32; | 353 | return VK_FORMAT_A2B10G10R10_SNORM_PACK32; |
| 354 | default: | ||
| 355 | break; | ||
| 350 | } | 356 | } |
| 351 | break; | 357 | break; |
| 352 | case Maxwell::VertexAttribute::Type::UnsignedScaled: | 358 | case Maxwell::VertexAttribute::Type::UnsignedScaled: |
| @@ -369,6 +375,8 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib | |||
| 369 | return VK_FORMAT_R16G16B16A16_USCALED; | 375 | return VK_FORMAT_R16G16B16A16_USCALED; |
| 370 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | 376 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: |
| 371 | return VK_FORMAT_A2B10G10R10_USCALED_PACK32; | 377 | return VK_FORMAT_A2B10G10R10_USCALED_PACK32; |
| 378 | default: | ||
| 379 | break; | ||
| 372 | } | 380 | } |
| 373 | break; | 381 | break; |
| 374 | case Maxwell::VertexAttribute::Type::SignedScaled: | 382 | case Maxwell::VertexAttribute::Type::SignedScaled: |
| @@ -391,6 +399,8 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib | |||
| 391 | return VK_FORMAT_R16G16B16A16_SSCALED; | 399 | return VK_FORMAT_R16G16B16A16_SSCALED; |
| 392 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | 400 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: |
| 393 | return VK_FORMAT_A2B10G10R10_SSCALED_PACK32; | 401 | return VK_FORMAT_A2B10G10R10_SSCALED_PACK32; |
| 402 | default: | ||
| 403 | break; | ||
| 394 | } | 404 | } |
| 395 | break; | 405 | break; |
| 396 | case Maxwell::VertexAttribute::Type::UnsignedInt: | 406 | case Maxwell::VertexAttribute::Type::UnsignedInt: |
| @@ -421,6 +431,8 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib | |||
| 421 | return VK_FORMAT_R32G32B32A32_UINT; | 431 | return VK_FORMAT_R32G32B32A32_UINT; |
| 422 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | 432 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: |
| 423 | return VK_FORMAT_A2B10G10R10_UINT_PACK32; | 433 | return VK_FORMAT_A2B10G10R10_UINT_PACK32; |
| 434 | default: | ||
| 435 | break; | ||
| 424 | } | 436 | } |
| 425 | break; | 437 | break; |
| 426 | case Maxwell::VertexAttribute::Type::SignedInt: | 438 | case Maxwell::VertexAttribute::Type::SignedInt: |
| @@ -451,6 +463,8 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib | |||
| 451 | return VK_FORMAT_R32G32B32A32_SINT; | 463 | return VK_FORMAT_R32G32B32A32_SINT; |
| 452 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: | 464 | case Maxwell::VertexAttribute::Size::Size_10_10_10_2: |
| 453 | return VK_FORMAT_A2B10G10R10_SINT_PACK32; | 465 | return VK_FORMAT_A2B10G10R10_SINT_PACK32; |
| 466 | default: | ||
| 467 | break; | ||
| 454 | } | 468 | } |
| 455 | break; | 469 | break; |
| 456 | case Maxwell::VertexAttribute::Type::Float: | 470 | case Maxwell::VertexAttribute::Type::Float: |
| @@ -471,6 +485,8 @@ VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttrib | |||
| 471 | return VK_FORMAT_R32G32B32_SFLOAT; | 485 | return VK_FORMAT_R32G32B32_SFLOAT; |
| 472 | case Maxwell::VertexAttribute::Size::Size_32_32_32_32: | 486 | case Maxwell::VertexAttribute::Size::Size_32_32_32_32: |
| 473 | return VK_FORMAT_R32G32B32A32_SFLOAT; | 487 | return VK_FORMAT_R32G32B32A32_SFLOAT; |
| 488 | default: | ||
| 489 | break; | ||
| 474 | } | 490 | } |
| 475 | break; | 491 | break; |
| 476 | } | 492 | } |
diff --git a/src/video_core/renderer_vulkan/wrapper.cpp b/src/video_core/renderer_vulkan/wrapper.cpp index 013865aa4..fe291a148 100644 --- a/src/video_core/renderer_vulkan/wrapper.cpp +++ b/src/video_core/renderer_vulkan/wrapper.cpp | |||
| @@ -262,6 +262,22 @@ const char* ToString(VkResult result) noexcept { | |||
| 262 | return "VK_ERROR_INVALID_DEVICE_ADDRESS_EXT"; | 262 | return "VK_ERROR_INVALID_DEVICE_ADDRESS_EXT"; |
| 263 | case VkResult::VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT: | 263 | case VkResult::VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT: |
| 264 | return "VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT"; | 264 | return "VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT"; |
| 265 | case VkResult::VK_ERROR_UNKNOWN: | ||
| 266 | return "VK_ERROR_UNKNOWN"; | ||
| 267 | case VkResult::VK_ERROR_INCOMPATIBLE_VERSION_KHR: | ||
| 268 | return "VK_ERROR_INCOMPATIBLE_VERSION_KHR"; | ||
| 269 | case VkResult::VK_THREAD_IDLE_KHR: | ||
| 270 | return "VK_THREAD_IDLE_KHR"; | ||
| 271 | case VkResult::VK_THREAD_DONE_KHR: | ||
| 272 | return "VK_THREAD_DONE_KHR"; | ||
| 273 | case VkResult::VK_OPERATION_DEFERRED_KHR: | ||
| 274 | return "VK_OPERATION_DEFERRED_KHR"; | ||
| 275 | case VkResult::VK_OPERATION_NOT_DEFERRED_KHR: | ||
| 276 | return "VK_OPERATION_NOT_DEFERRED_KHR"; | ||
| 277 | case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT: | ||
| 278 | return "VK_PIPELINE_COMPILE_REQUIRED_EXT"; | ||
| 279 | case VkResult::VK_RESULT_MAX_ENUM: | ||
| 280 | return "VK_RESULT_MAX_ENUM"; | ||
| 265 | } | 281 | } |
| 266 | return "Unknown"; | 282 | return "Unknown"; |
| 267 | } | 283 | } |