From 00bf875d553a6c9ab1fb76bb6c674df6504ae7e8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 14 Nov 2017 13:23:00 +1000 Subject: [PATCH] radv: it isn't an error to not support a format or driver This reverts two of the vk_error changes: reporting unsupported format is common, and testing non-amdgpu drivers and ignoring them is also common. Fixes: cd64a4f70 (radv: use vk_error() everywhere an error is returned) Reviewed-by: Samuel Pitoiset Signed-off-by: Dave Airlie --- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_formats.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 6666b62..722c768 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -196,7 +196,7 @@ radv_physical_device_init(struct radv_physical_device *device, if (strcmp(version->name, "amdgpu")) { drmFreeVersion(version); close(fd); - return vk_error(VK_ERROR_INCOMPATIBLE_DRIVER); + return VK_ERROR_INCOMPATIBLE_DRIVER; } drmFreeVersion(version); diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 7f679e8..5c79ea7 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -1144,7 +1144,7 @@ unsupported: .maxResourceSize = 0, }; - return vk_error(VK_ERROR_FORMAT_NOT_SUPPORTED); + return VK_ERROR_FORMAT_NOT_SUPPORTED; } VkResult radv_GetPhysicalDeviceImageFormatProperties( -- 2.7.4