commit 10135af20c343e75ea16825afd2915276306c24f
author Saifuddin Hitawala <hitawala@chromium.org> Thu Apr 18 23:04:55 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Apr 18 23:04:55 2024 +0000
tree c1e29839cd3d131c0368125e982880667b9a19d5
parent 79167dcd1b2eae985fe42600cb77f6a040df12e5

[YCbCr Samplers] Iterate over chain for external format validation

Change-Id: If9b15597bfa37f444305e1cbbddb30100f5639d3
Bug: dawn:2476
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/184623
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Saifuddin Hitawala <hitawala@chromium.org>

src/dawn/native/vulkan/SamplerVk.cpp

diff --git a/src/dawn/native/vulkan/SamplerVk.cpp b/src/dawn/native/vulkan/SamplerVk.cpp
index e10248f..e931213 100644
--- a/src/dawn/native/vulkan/SamplerVk.cpp
+++ b/src/dawn/native/vulkan/SamplerVk.cpp
@@ -127,12 +127,18 @@
         const VkSamplerYcbcrConversionCreateInfo& vulkanYCbCrInfo =
             vulkanYCbCrDescriptor->vulkanYCbCrInfo;
 #if DAWN_PLATFORM_IS(ANDROID)
-        const VkExternalFormatANDROID* vkExternalFormat =
-            static_cast<const VkExternalFormatANDROID*>(vulkanYCbCrInfo.pNext);
-        if (vkExternalFormat) {
-            DAWN_INVALID_IF((vkExternalFormat->externalFormat == 0 &&
-                             vulkanYCbCrInfo.format == VK_FORMAT_UNDEFINED),
-                            "Both VkFormat and VkExternalFormatANDROID are undefined.");
+        const VkBaseInStructure* chain =
+            static_cast<const VkBaseInStructure*>(vulkanYCbCrInfo.pNext);
+        while (chain != nullptr) {
+            if (chain->sType == VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID) {
+                const VkExternalFormatANDROID* vkExternalFormat =
+                    reinterpret_cast<const VkExternalFormatANDROID*>(chain);
+                DAWN_INVALID_IF((vkExternalFormat->externalFormat == 0 &&
+                                 vulkanYCbCrInfo.format == VK_FORMAT_UNDEFINED),
+                                "Both VkFormat and VkExternalFormatANDROID are undefined.");
+                break;
+            }
+            chain = chain->pNext;
         }
 #endif  // DAWN_PLATFORM_IS(ANDROID)