mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 04:36:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/main: Fix NVIDIA direct mode detection code

Browse source 
Fix bug introduced in 14ffa34658 (!1894).
This commit is contained in:
Jakob Bornecrantz 2023-07-23 15:35:06 +01:00
parent 46fba6749c
commit e255cf8771
1 changed files with 7 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/xrt/compositor/main/comp_window_direct_nvidia.c
View file

@ -93,34 +93,6 @@ _update_window_title(struct comp_target *ct, const char *title)
(void)title;
}
static VkResult
enumerate_physical_device_display_properties(struct vk_bundle *vk,
VkPhysicalDevice physical_device,
VkDisplayPropertiesKHR **out_props,
uint32_t *out_prop_count)
{
VkDisplayPropertiesKHR *props = NULL;
uint32_t prop_count = 0;
VkResult ret;
ret = vk->vkGetPhysicalDeviceDisplayPropertiesKHR(NULL, &prop_count, NULL);
vk_check_error("vkGetPhysicalDeviceDisplayPropertiesKHR", ret, ret);
if (prop_count == 0) {
*out_props = props;
*out_prop_count = prop_count;
return VK_SUCCESS;
}
props = U_TYPED_ARRAY_CALLOC(VkDisplayPropertiesKHR, prop_count);
ret = vk->vkGetPhysicalDeviceDisplayPropertiesKHR(NULL, &prop_count, props);
vk_check_error_with_free("vkGetPhysicalDeviceDisplayPropertiesKHR", ret, ret, props);
*out_props = props;
*out_prop_count = prop_count;
return VK_SUCCESS;
}
struct comp_target *
comp_window_direct_nvidia_create(struct comp_compositor *c)
{
@ -341,13 +313,14 @@ _test_for_nvidia(struct comp_compositor *c, struct vk_bundle *vk)
}
// Get a list of attached displays.
ret = enumerate_physical_device_display_properties( //
vk, //
vk->physical_device, //
&display_props, //
&display_count); //
ret = vk_enumerate_physical_device_display_properties( //
vk, //
vk->physical_device, //
&display_count, //
&display_props); //
if (ret != VK_SUCCESS) {
CVK_ERROR(c, "enumerate_physical_device_display_properties", "Failed to get display properties ", ret);
CVK_ERROR(c, "vk_enumerate_physical_device_display_properties", "Failed to get display properties ",
ret);
return false;
}