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 <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---
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.
This commit is contained in:
Emil Velikov 2016-05-28 20:03:34 +01:00 committed by Emil Velikov
parent 93e65fdcac
commit ace5403453
1 changed files with 3 additions and 1 deletions

View File

@ -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);