OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Use vk_outarray in vkGetPhysicalDeviceQueueFamilyProperties

Browse Source 
No intended change in behavior. Just a refactor.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Chad Versace
2017-03-05 13:15:06 -08:00
parent 876f0ecd2f
commit c5a0829e1f
1 changed files with 18 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/intel/vulkan/anv_device.c
View File

@@ -660,43 +660,27 @@ void anv_GetPhysicalDeviceProperties2KHR(
} }
} }
static void /* We support exactly one queue family. */
anv_get_queue_family_properties(struct anv_physical_device *phys_dev, static const VkQueueFamilyProperties
VkQueueFamilyProperties *props) anv_queue_family_properties = {
{ .queueFlags = VK_QUEUE_GRAPHICS_BIT |
*props = (VkQueueFamilyProperties) { VK_QUEUE_COMPUTE_BIT |
.queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_TRANSFER_BIT,
VK_QUEUE_COMPUTE_BIT | .queueCount = 1,
VK_QUEUE_TRANSFER_BIT, .timestampValidBits = 36, /* XXX: Real value here */
.queueCount = 1, .minImageTransferGranularity = (VkExtent3D) { 1, 1, 1 },
.timestampValidBits = 36, /* XXX: Real value here */ };
.minImageTransferGranularity = (VkExtent3D) { 1, 1, 1 },
};
}
void anv_GetPhysicalDeviceQueueFamilyProperties( void anv_GetPhysicalDeviceQueueFamilyProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t* pCount, uint32_t* pCount,
VkQueueFamilyProperties* pQueueFamilyProperties) VkQueueFamilyProperties* pQueueFamilyProperties)
{ {
ANV_FROM_HANDLE(anv_physical_device, phys_dev, physicalDevice); VK_OUTARRAY_MAKE(out, pQueueFamilyProperties, pCount);
if (pQueueFamilyProperties == NULL) { vk_outarray_append(&out, p) {
*pCount = 1; *p = anv_queue_family_properties;
return;
} }
/* The spec implicitly allows the incoming count to be 0. From the Vulkan
* 1.0.38 spec, Section 4.1 Physical Devices:
*
* If the value referenced by pQueueFamilyPropertyCount is not 0 [then
* do stuff].
*/
if (*pCount == 0)
return;
*pCount = 1;
anv_get_queue_family_properties(phys_dev, pQueueFamilyProperties);
} }
void anv_GetPhysicalDeviceQueueFamilyProperties2KHR( void anv_GetPhysicalDeviceQueueFamilyProperties2KHR(
@@ -705,34 +689,13 @@ void anv_GetPhysicalDeviceQueueFamilyProperties2KHR(
VkQueueFamilyProperties2KHR* pQueueFamilyProperties) VkQueueFamilyProperties2KHR* pQueueFamilyProperties)
{ {
ANV_FROM_HANDLE(anv_physical_device, phys_dev, physicalDevice); VK_OUTARRAY_MAKE(out, pQueueFamilyProperties, pQueueFamilyPropertyCount);
if (pQueueFamilyProperties == NULL) { vk_outarray_append(&out, p) {
*pQueueFamilyPropertyCount = 1; p->queueFamilyProperties = anv_queue_family_properties;
return;
}
/* The spec implicitly allows the incoming count to be 0. From the Vulkan vk_foreach_struct(s, p->pNext) {
* 1.0.38 spec, Section 4.1 Physical Devices: anv_debug_ignored_stype(s->sType);
*
* If the value referenced by pQueueFamilyPropertyCount is not 0 [then
* do stuff].
*/
if (*pQueueFamilyPropertyCount == 0)
return;
/* We support exactly one queue family. So need to traverse only the first
* array element's pNext chain.
*/
*pQueueFamilyPropertyCount = 1;
anv_get_queue_family_properties(phys_dev,
&pQueueFamilyProperties->queueFamilyProperties);
vk_foreach_struct(ext, pQueueFamilyProperties->pNext) {
switch (ext->sType) {
default:
anv_debug_ignored_stype(ext->sType);
break;
} }
} }
} }