hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-29 07:55:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

render/vulkan: improve message on format prop error

Browse source 
Use a more appropriate message on
vkGetPhysicalDeviceImageFormatProperties2() error.
This commit is contained in:
Simon Ser 2022-12-02 10:46:13 +01:00
parent 338a9616bd
commit bc7f8de842
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
render/vulkan/pixel_format.c
View file

@ -220,10 +220,12 @@ static bool query_modifier_usage_support(struct wlr_vk_device *dev, VkFormat vk_
res = vkGetPhysicalDeviceImageFormatProperties2(dev->phdev, &fmti, &ifmtp); res = vkGetPhysicalDeviceImageFormatProperties2(dev->phdev, &fmti, &ifmtp);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
if (res != VK_ERROR_FORMAT_NOT_SUPPORTED) { if (res == VK_ERROR_FORMAT_NOT_SUPPORTED) {
*errmsg = "unsupported format";
} else {
wlr_vk_error("vkGetPhysicalDeviceImageFormatProperties2", res); wlr_vk_error("vkGetPhysicalDeviceImageFormatProperties2", res);
*errmsg = "failed to get format properties";
} }
*errmsg = "unsupported format";
return false; return false;
} else if (!(emp->externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) { } else if (!(emp->externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) {
*errmsg = "import not supported"; *errmsg = "import not supported";
@ -370,12 +372,12 @@ void vulkan_format_props_query(struct wlr_vk_device *dev,
res = vkGetPhysicalDeviceImageFormatProperties2(dev->phdev, &fmti, &ifmtp); res = vkGetPhysicalDeviceImageFormatProperties2(dev->phdev, &fmti, &ifmtp);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
if (res != VK_ERROR_FORMAT_NOT_SUPPORTED) { if (res == VK_ERROR_FORMAT_NOT_SUPPORTED) {
wlr_vk_error("vkGetPhysicalDeviceImageFormatProperties2", shm_texture_status = "✗ texture (unsupported format)";
res); } else {
wlr_vk_error("vkGetPhysicalDeviceImageFormatProperties2", res);
shm_texture_status = "✗ texture (failed to get format properties)";
} }
shm_texture_status = "✗ texture (unsupported format)";
} else { } else {
VkExtent3D me = ifmtp.imageFormatProperties.maxExtent; VkExtent3D me = ifmtp.imageFormatProperties.maxExtent;
props.max_extent.width = me.width; props.max_extent.width = me.width;
@ -430,4 +432,3 @@ struct wlr_vk_format_modifier_props *vulkan_format_props_find_modifier(
return NULL; return NULL;
} }