AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: slight refactor of load_device_extensions()

Browse Source 
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11036>
This commit is contained in:
Hoe Hao Cheng
2021-05-28 03:59:02 +08:00
committed by Marge Bot
parent c3608e6ac0
commit 039078fe97
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_screen.c
+31 -25
View File
@@ -1221,6 +1221,27 @@ zink_screen_init_descriptor_funcs(struct zink_screen *screen, bool fallback)
} }
} }
static bool
check_have_device_time(struct zink_screen *screen)
{
uint32_t num_domains = 0;
screen->vk_GetPhysicalDeviceCalibrateableTimeDomainsEXT(screen->pdev, &num_domains, NULL);
assert(num_domains > 0);
VkTimeDomainEXT *domains = malloc(sizeof(VkTimeDomainEXT) * num_domains);
screen->vk_GetPhysicalDeviceCalibrateableTimeDomainsEXT(screen->pdev, &num_domains, domains);
/* VK_TIME_DOMAIN_DEVICE_EXT is used for the ctx->get_timestamp hook and is the only one we really need */
for (unsigned i = 0; i < num_domains; i++) {
if (domains[i] == VK_TIME_DOMAIN_DEVICE_EXT) {
return true;
}
}
free(domains);
return false;
}
static bool static bool
load_device_extensions(struct zink_screen *screen) load_device_extensions(struct zink_screen *screen)
{ {
@@ -1248,24 +1269,6 @@ load_device_extensions(struct zink_screen *screen)
if (screen->info.have_EXT_calibrated_timestamps) { if (screen->info.have_EXT_calibrated_timestamps) {
GET_PROC_ADDR_INSTANCE(GetPhysicalDeviceCalibrateableTimeDomainsEXT); GET_PROC_ADDR_INSTANCE(GetPhysicalDeviceCalibrateableTimeDomainsEXT);
GET_PROC_ADDR(GetCalibratedTimestampsEXT); GET_PROC_ADDR(GetCalibratedTimestampsEXT);
uint32_t num_domains = 0;
screen->vk_GetPhysicalDeviceCalibrateableTimeDomainsEXT(screen->pdev, &num_domains, NULL);
assert(num_domains > 0);
VkTimeDomainEXT *domains = malloc(sizeof(VkTimeDomainEXT) * num_domains);
screen->vk_GetPhysicalDeviceCalibrateableTimeDomainsEXT(screen->pdev, &num_domains, domains);
/* VK_TIME_DOMAIN_DEVICE_EXT is used for the ctx->get_timestamp hook and is the only one we really need */
ASSERTED bool have_device_time = false;
for (unsigned i = 0; i < num_domains; i++) {
if (domains[i] == VK_TIME_DOMAIN_DEVICE_EXT) {
have_device_time = true;
break;
}
}
assert(have_device_time);
free(domains);
} }
if (screen->info.have_EXT_extended_dynamic_state) { if (screen->info.have_EXT_extended_dynamic_state) {
GET_PROC_ADDR(CmdSetViewportWithCountEXT); GET_PROC_ADDR(CmdSetViewportWithCountEXT);
@@ -1300,13 +1303,6 @@ load_device_extensions(struct zink_screen *screen)
GET_PROC_ADDR_KHR(UpdateDescriptorSetWithTemplate); GET_PROC_ADDR_KHR(UpdateDescriptorSetWithTemplate);
} }
screen->have_triangle_fans = true;
#if defined(VK_EXTX_PORTABILITY_SUBSET_EXTENSION_NAME)
if (screen->info.have_EXTX_portability_subset) {
screen->have_triangle_fans = (VK_TRUE == screen->info.portability_subset_extx_feats.triangleFans);
}
#endif // VK_EXTX_PORTABILITY_SUBSET_EXTENSION_NAME
if (screen->info.have_KHR_swapchain) { if (screen->info.have_KHR_swapchain) {
GET_PROC_ADDR(CreateSwapchainKHR); GET_PROC_ADDR(CreateSwapchainKHR);
GET_PROC_ADDR(DestroySwapchainKHR); GET_PROC_ADDR(DestroySwapchainKHR);
@@ -1718,6 +1714,16 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
if (!zink_verify_device_extensions(screen)) if (!zink_verify_device_extensions(screen))
goto fail; goto fail;
if (!check_have_device_time(screen))
goto fail;
screen->have_triangle_fans = true;
#if defined(VK_EXTX_PORTABILITY_SUBSET_EXTENSION_NAME)
if (screen->info.have_EXTX_portability_subset) {
screen->have_triangle_fans = (VK_TRUE == screen->info.portability_subset_extx_feats.triangleFans);
}
#endif // VK_EXTX_PORTABILITY_SUBSET_EXTENSION_NAME
check_base_requirements(screen); check_base_requirements(screen);
screen->base.get_name = zink_get_name; screen->base.get_name = zink_get_name;