Module: Mesa Branch: master Commit: 7c277eae986ae230b36fc09fd2346f10ea8589e4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c277eae986ae230b36fc09fd2346f10ea8589e4
Author: Emil Velikov <emil.veli...@collabora.com> Date: Thu Nov 24 20:30:45 2016 +0000 radv: don't return VK_SUCCESS if radv_device_get_cache_uuid() fails If radv_device_get_cache_uuid() fails result will be VK_SUCCESS as set by the radv_init_wsi() call above. Fixes: d943839 (radv: Use library mtime for cache UUID.) Signed-off-by: Emil Velikov <emil.veli...@collabora.com> Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> --- src/amd/vulkan/radv_device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 0dbb3f8..ce697a9 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -125,6 +125,8 @@ radv_physical_device_init(struct radv_physical_device *device, if (radv_device_get_cache_uuid(device->rad_info.family, device->uuid)) { radv_finish_wsi(device); device->ws->destroy(device->ws); + result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED, + "cannot generate UUID"); goto fail; } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit