From: Kristian Høgsberg <kristian.h.kristensen@intel.com>
Date: Mon, 18 May 2015 15:50:04 +0000 (-0700)
Subject: vk: Fix vkGetOjectInfo return values
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=05754549e86bb548f806d62f58ae1492c4968ef5;p=mesa.git

vk: Fix vkGetOjectInfo return values

We weren't properly returning the allocation count.
---

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index d87227cd772..49b268a3739 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -1041,7 +1041,7 @@ VkResult anv_GetObjectInfo(
     void*                                       pData)
 {
    VkMemoryRequirements memory_requirements;
-   uint32_t count;
+   uint32_t *count;
 
    switch (infoType) {
    case VK_OBJECT_INFO_TYPE_MEMORY_REQUIREMENTS:
@@ -1049,9 +1049,7 @@ VkResult anv_GetObjectInfo(
       if (pData == NULL)
          return VK_SUCCESS;
 
-      fill_memory_requirements(objType, object, &memory_requirements);
-      memcpy(pData, &memory_requirements,
-             MIN2(*pDataSize, sizeof(memory_requirements)));
+      fill_memory_requirements(objType, object, pData);
       return VK_SUCCESS;
 
    case VK_OBJECT_INFO_TYPE_MEMORY_ALLOCATION_COUNT:
@@ -1059,7 +1057,8 @@ VkResult anv_GetObjectInfo(
       if (pData == NULL)
          return VK_SUCCESS;
 
-      count = get_allocation_count(objType);
+      count = pData;
+      *count = get_allocation_count(objType);
       return VK_SUCCESS;
 
    default: