From ace54034536936c176270afc087675390072b17c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 28 May 2016 20:03:34 +0100 Subject: anv: bail out if anv_wsi_init() fails Otherwise we'll end up setting up a device with no winsys integration. Signed-off-by: Emil Velikov Reviewed-by: Jason Ekstrand --- Hard-coding the rendernode name in anv_physical_device_init() is a bad idea really. We could/should be using drmGetDevices() to get info on all the devices (master/render/etc. node names, pci location etc.) and apply our heuristics on top of that. That can come up as a follow up change. --- src/intel/vulkan/anv_device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/intel/vulkan/anv_device.c') diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index da7a394..046777d 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -150,7 +150,9 @@ anv_physical_device_init(struct anv_physical_device *device, device->compiler->shader_debug_log = compiler_debug_log; device->compiler->shader_perf_log = compiler_perf_log; - anv_init_wsi(device); + result = anv_init_wsi(device); + if (result != VK_SUCCESS) + goto fail; /* XXX: Actually detect bit6 swizzling */ isl_device_init(&device->isl_dev, device->info, swizzled); -- cgit v1.1