commit | 92efab1160c97566d97c4e5719bc76625c28e9c7 | [log] [tgz] |
---|---|---|
author | Roman Kiryanov <rkir@google.com> | Wed Apr 24 17:56:40 2019 -0700 |
committer | Roman Kiryanov <rkir@google.com> | Fri Apr 26 16:51:39 2019 -0700 |
tree | e60c4fb1f69709bcd9b1e2c48be0739813426851 | |
parent | 9a5220d9ee3eeff520c5e67bd36584612a890579 [diff] |
Fail on_vkCreateImage if format is not recongnized Fail on_vkCreateImage earlier if vk_format_from_android did not recognize the format. Bug: 131181334 Test: make Change-Id: Idf884c1e8d4fc1a8f3bc40fa195719fced231d1b Merged-In: I21e213bb1f4e2b22989269b77859912a51ad5e28 Signed-off-by: Roman Kiryanov <rkir@google.com>
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