commit ecb90755e44b2238c5943fc18a40fec5131f15bf
author Lingfeng Yang <lfy@google.com> Thu Apr 25 15:34:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 25 15:34:38 2019 +0000
tree 6163b0f51a9111f4f3f62dbc4ec5f780dadffc78
parent fd2683b136287d1e7186058a89a02423572e95d4
parent 1138797a6fd6451f5825b33d1ec8895434f4aa9c

Merge "Revert "Fix vk_append_struct to add elements after the last one""

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 36c2a6b..8668a50 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -2178,6 +2178,8 @@
             if (extFormatAndroidPtr->externalFormat) {
                 pCreateInfo_mut->format =
                     vk_format_from_android(extFormatAndroidPtr->externalFormat);
+                if (pCreateInfo_mut->format == VK_FORMAT_UNDEFINED)
+                    return VK_ERROR_VALIDATION_FAILED_EXT;
             }
         }
 #endif