Don't assert on component swizzle matching identity

https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/3399 clarified that when identity component swizzle is expected, one can also use the corresponding component enum. Fixes: b/167706626 Change-Id: I2c94f6ac108be5269d56f397ecf3da58cd310e5e Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48168Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Sean Risser <srisser@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com>

Don't assert on component swizzle matching identity
e63aa953 · Nicolas Capens · Nicolas Capens · 2c5b4455 · e63aa953
Commit e63aa953 authored Sep 03, 2020 by Nicolas Capens Committed by Nicolas Capens Sep 04, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

libVulkan.cpp src/Vulkan/libVulkan.cpp +4 -4

No files found.
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -1757,10 +1757,10 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateImageView(VkDevice device, const VkImageV
 				if(ycbcrConversion)
 				{
-					ASSERT((pCreateInfo->components.r == VK_COMPONENT_SWIZZLE_IDENTITY) &&
+					ASSERT((pCreateInfo->components.r == VK_COMPONENT_SWIZZLE_IDENTITY || pCreateInfo->components.r == VK_COMPONENT_SWIZZLE_R) &&
-					       (pCreateInfo->components.g == VK_COMPONENT_SWIZZLE_IDENTITY) &&
+					       (pCreateInfo->components.g == VK_COMPONENT_SWIZZLE_IDENTITY || pCreateInfo->components.g == VK_COMPONENT_SWIZZLE_G) &&
-					       (pCreateInfo->components.b == VK_COMPONENT_SWIZZLE_IDENTITY) &&
+					       (pCreateInfo->components.b == VK_COMPONENT_SWIZZLE_IDENTITY || pCreateInfo->components.b == VK_COMPONENT_SWIZZLE_B) &&
-					       (pCreateInfo->components.a == VK_COMPONENT_SWIZZLE_IDENTITY));
+					       (pCreateInfo->components.a == VK_COMPONENT_SWIZZLE_IDENTITY || pCreateInfo->components.a == VK_COMPONENT_SWIZZLE_A));
 				}
 			}
 			break;