fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: rename global extension properties structs

Browse source 
All extension arrays are global, but only one of them refers to instance
extensions.

The device extension array refers to extensions that are common across
all physical devices. This disctinction will be more imporant once we
have dynamic extension support for devices.

Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Andres Rodriguez 2017-01-13 18:44:16 -05:00 • committed by Bas Nieuwenhuizen
parent 0eb8b6a3e1
commit 5323efb685
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/amd/vulkan/radv_device.c
View file

@ -147,7 +147,7 @@ radv_physical_device_finish(struct radv_physical_device *device)
device->ws->destroy(device->ws);
}
static const VkExtensionProperties global_extensions[] = {
static const VkExtensionProperties instance_extensions[] = {
{
.extensionName = VK_KHR_SURFACE_EXTENSION_NAME,
.specVersion = 25,
@ -172,7 +172,7 @@ static const VkExtensionProperties global_extensions[] = {
#endif
};
static const VkExtensionProperties device_extensions[] = {
static const VkExtensionProperties common_device_extensions[] = {
{
.extensionName = VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,
.specVersion = 1,
@ -258,9 +258,9 @@ VkResult radv_CreateInstance(
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
bool found = false;
for (uint32_t j = 0; j < ARRAY_SIZE(global_extensions); j++) {
for (uint32_t j = 0; j < ARRAY_SIZE(instance_extensions); j++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
global_extensions[j].extensionName) == 0) {
instance_extensions[j].extensionName) == 0) {
found = true;
break;
}
@ -697,9 +697,9 @@ VkResult radv_CreateDevice(
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
bool found = false;
for (uint32_t j = 0; j < ARRAY_SIZE(device_extensions); j++) {
for (uint32_t j = 0; j < ARRAY_SIZE(common_device_extensions); j++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
device_extensions[j].extensionName) == 0) {
common_device_extensions[j].extensionName) == 0) {
found = true;
break;
}
@ -826,14 +826,14 @@ VkResult radv_EnumerateInstanceExtensionProperties(
VkExtensionProperties* pProperties)
{
if (pProperties == NULL) {
*pPropertyCount = ARRAY_SIZE(global_extensions);
*pPropertyCount = ARRAY_SIZE(instance_extensions);
return VK_SUCCESS;
}
*pPropertyCount = MIN2(*pPropertyCount, ARRAY_SIZE(global_extensions));
typed_memcpy(pProperties, global_extensions, *pPropertyCount);
*pPropertyCount = MIN2(*pPropertyCount, ARRAY_SIZE(instance_extensions));
typed_memcpy(pProperties, instance_extensions, *pPropertyCount);
if (*pPropertyCount < ARRAY_SIZE(global_extensions))
if (*pPropertyCount < ARRAY_SIZE(instance_extensions))
return VK_INCOMPLETE;
return VK_SUCCESS;
@ -846,14 +846,14 @@ VkResult radv_EnumerateDeviceExtensionProperties(
VkExtensionProperties* pProperties)
{
if (pProperties == NULL) {
*pPropertyCount = ARRAY_SIZE(device_extensions);
*pPropertyCount = ARRAY_SIZE(common_device_extensions);
return VK_SUCCESS;
}
*pPropertyCount = MIN2(*pPropertyCount, ARRAY_SIZE(device_extensions));
typed_memcpy(pProperties, device_extensions, *pPropertyCount);
*pPropertyCount = MIN2(*pPropertyCount, ARRAY_SIZE(common_device_extensions));
typed_memcpy(pProperties, common_device_extensions, *pPropertyCount);
if (*pPropertyCount < ARRAY_SIZE(device_extensions))
if (*pPropertyCount < ARRAY_SIZE(common_device_extensions))
return VK_INCOMPLETE;
return VK_SUCCESS;