From 802fa57274bb504b688bc966120c203bf4854e8e Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 2 Sep 2022 09:27:31 +0300 Subject: [PATCH] anv/hasvk: tweak loading failure messages We don't want to print out too many : MESA: error: ../src/intel/vulkan/anv_device.c:769: anv does not support Intel(R) HD Graphics (HSW GT1); use hasvk (VK_ERROR_INCOMPATIBLE_DRIVER) whenever anv is not able to load on a HSW device. Similarly hasvk should not print error on anything gfx9+. Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke Part-of: --- src/intel/vulkan/anv_device.c | 4 ++-- src/intel/vulkan_hasvk/anv_device.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 64a34eb40ad..5452efc2bd8 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -766,8 +766,8 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, "Vulkan not yet supported on %s", devinfo.name); goto fail_fd; } else if (devinfo.ver < 9) { - result = vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, - "anv does not support %s; use hasvk", devinfo.name); + /* Silently fail here, hasvk should pick up this device. */ + result = VK_ERROR_INCOMPATIBLE_DRIVER; goto fail_fd; } diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index c52aece7e45..16a2a1aca5f 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -774,8 +774,10 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, /* Gfx8 fully supported */ is_alpha = false; } else { - result = vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, - "Vulkan not yet supported on %s", devinfo.name); + /* Silently fail here, anv will either pick up this device or display an + * error message. + */ + result = VK_ERROR_INCOMPATIBLE_DRIVER; goto fail_fd; }