fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 11:20:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk/device: Don't allow device or instance creation with invalid extensions

Browse source
This commit is contained in:
Jason Ekstrand 2015-09-17 11:19:16 -07:00
parent dcf424c98c
commit b5f6889648
1 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/vulkan/anv_device.c
View file

@ -110,6 +110,21 @@ static const VkAllocCallbacks default_alloc_callbacks = {
.pfnFree = default_free
};
static const VkExtensionProperties global_extensions[] = {
{
.extName = "VK_WSI_swapchain",
.specVersion = 12
},
};
static const VkExtensionProperties device_extensions[] = {
{
.extName = "VK_WSI_device_swapchain",
.specVersion = 12
},
};
VkResult anv_CreateInstance(
const VkInstanceCreateInfo* pCreateInfo,
VkInstance* pInstance)
@ -120,6 +135,19 @@ VkResult anv_CreateInstance(
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO);
for (uint32_t i = 0; i < pCreateInfo->extensionCount; i++) {
bool found = false;
for (uint32_t j = 0; j < ARRAY_SIZE(global_extensions); j++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
global_extensions[j].extName) == 0) {
found = true;
break;
}
}
if (!found)
return vk_error(VK_ERROR_INVALID_EXTENSION);
}
if (pCreateInfo->pAllocCb) {
alloc_callbacks = pCreateInfo->pAllocCb;
user_data = pCreateInfo->pAllocCb->pUserData;
@ -546,6 +574,19 @@ VkResult anv_CreateDevice(
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO);
for (uint32_t i = 0; i < pCreateInfo->extensionCount; i++) {
bool found = false;
for (uint32_t j = 0; j < ARRAY_SIZE(device_extensions); j++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i],
device_extensions[j].extName) == 0) {
found = true;
break;
}
}
if (!found)
return vk_error(VK_ERROR_INVALID_EXTENSION);
}
anv_set_dispatch_gen(physical_device->info->gen);
device = anv_instance_alloc(instance, sizeof(*device), 8,
@ -636,13 +677,6 @@ VkResult anv_DestroyDevice(
return VK_SUCCESS;
}
static const VkExtensionProperties global_extensions[] = {
{
.extName = "VK_WSI_swapchain",
.specVersion = 12
},
};
VkResult anv_GetGlobalExtensionProperties(
const char* pLayerName,
uint32_t* pCount,
@ -661,13 +695,6 @@ VkResult anv_GetGlobalExtensionProperties(
return VK_SUCCESS;
}
static const VkExtensionProperties device_extensions[] = {
{
.extName = "VK_WSI_device_swapchain",
.specVersion = 12
},
};
VkResult anv_GetPhysicalDeviceExtensionProperties(
VkPhysicalDevice physicalDevice,
const char* pLayerName,