commit e63aa953ddfd935a022090b3ef221438a328d1a1
author Nicolas Capens <capn@google.com> Thu Sep 03 16:24:49 2020 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Sep 04 02:41:37 2020 +0000
tree da745f2aee106c0f20402de2e6e753d6daf58125
parent 2c5b4455854d3f622622eea2c8d1f243ba4fff84

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/+/48168
Tested-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>

src/Vulkan/libVulkan.cpp

diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp
index 3d90f48..32fcb91 100644
--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -1757,10 +1757,10 @@
 
 				if(ycbcrConversion)
 				{
-					ASSERT((pCreateInfo->components.r == VK_COMPONENT_SWIZZLE_IDENTITY) &&
-					       (pCreateInfo->components.g == VK_COMPONENT_SWIZZLE_IDENTITY) &&
-					       (pCreateInfo->components.b == VK_COMPONENT_SWIZZLE_IDENTITY) &&
-					       (pCreateInfo->components.a == 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_G) &&
+					       (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_A));
 				}
 			}
 			break;