commit 91efb568935938bebb6d0ff8c458369fef76f6a7
author Theodore Dubois <tbodt@google.com> Thu Mar 12 13:28:17 2020 -0700
committer Roman Kiryanov <rkir@google.com> Mon Mar 16 13:35:36 2020 -0700
tree a3e50b89fdbae7e167e51c9b999136c884176a39
parent 09b5738b0bc4f9344a3c94c944b9ef893a0a6b77

Make vkEnumerate*ExtensionProperties conform to the Vulkan spec

Vulkan specifies that "on return the [pPropertyCount] is overwritten
with the number of structures actually written to pProperties," but this
wasn't happening.

Bug: 150953274
Test: presubmit
Merged-In: I9c576e05fa66eb2a1210c2b432d3ed20adf2cdd0
Change-Id: Iff26b63d77da0389ecf3b59fde72c1cac8d75472
Signed-off-by: Roman Kiryanov <rkir@google.com>

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 809732c..e7ad451 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -883,9 +883,11 @@
             return VK_SUCCESS;
         } else {
             auto actualExtensionCount = (uint32_t)filteredExts.size();
-            auto toWrite = actualExtensionCount < *pPropertyCount ? actualExtensionCount : *pPropertyCount;
+            if (*pPropertyCount > actualExtensionCount) {
+              *pPropertyCount = actualExtensionCount;
+            }
 
-            for (uint32_t i = 0; i < toWrite; ++i) {
+            for (uint32_t i = 0; i < *pPropertyCount; ++i) {
                 pProperties[i] = filteredExts[i];
             }
 
@@ -1051,9 +1053,11 @@
             return VK_SUCCESS;
         } else {
             auto actualExtensionCount = (uint32_t)filteredExts.size();
-            auto toWrite = actualExtensionCount < *pPropertyCount ? actualExtensionCount : *pPropertyCount;
+            if (*pPropertyCount > actualExtensionCount) {
+              *pPropertyCount = actualExtensionCount;
+            }
 
-            for (uint32_t i = 0; i < toWrite; ++i) {
+            for (uint32_t i = 0; i < *pPropertyCount; ++i) {
                 pProperties[i] = filteredExts[i];
             }