From: Damien Grassart <damien@grassart.com>
Date: Sat, 24 Dec 2016 23:41:45 +0000 (+0100)
Subject: radv: return count of queue families written
X-Git-Tag: upstream/17.1.0~3666
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a30b1a556b1ed7dc60befcec16343e80a3bd77e;p=platform%2Fupstream%2Fmesa.git

radv: return count of queue families written

The Vulkan spec indicates that
vkGetPhysicalDeviceQueueFamilyProperties() should overwrite
pQueueFamilyPropertyCount with the number of structures actually
written to pQueueFamilyProperties.

Signed-off-by: Damien Grassart <damien@grassart.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 47be5f7..dcbb015 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -583,8 +583,10 @@ void radv_GetPhysicalDeviceQueueFamilyProperties(
 		idx++;
 	}
 
-	if (!all_queues)
+	if (!all_queues) {
+		*pCount = idx;
 		return;
+	}
 
 	if (pdevice->rad_info.compute_rings > 0 && pdevice->rad_info.chip_class >= CIK) {
 		if (*pCount > idx) {
@@ -597,6 +599,7 @@ void radv_GetPhysicalDeviceQueueFamilyProperties(
 			idx++;
 		}
 	}
+	*pCount = idx;
 }
 
 void radv_GetPhysicalDeviceMemoryProperties(