anv/device: Embed isl_device

Embed struct isl_device into anv_physical_device and anv_device.  It
will later be used for surface layout calculations.
This commit is contained in:
Chad Versace 2015-11-13 10:12:51 -08:00
parent a4a2ea3f79
commit af392916ff
2 changed files with 10 additions and 0 deletions

View file

@ -56,6 +56,7 @@ anv_physical_device_init(struct anv_physical_device *device,
{
VkResult result;
int fd;
uint32_t gen10x;
fd = open(path, O_RDWR | O_CLOEXEC);
if (fd < 0)
@ -81,6 +82,10 @@ anv_physical_device_init(struct anv_physical_device *device,
goto fail;
}
gen10x = 10 * device->info->gen;
if (device->info->is_haswell)
gen10x += 5;
if (device->info->gen == 7 &&
!device->info->is_haswell && !device->info->is_baytrail) {
fprintf(stderr, "WARNING: Ivy Bridge Vulkan support is incomplete\n");
@ -128,6 +133,8 @@ 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;
isl_device_init(&device->isl_dev, gen10x);
return VK_SUCCESS;
fail:
@ -672,6 +679,7 @@ VkResult anv_CreateDevice(
anv_block_pool_init(&device->scratch_block_pool, device, 0x10000);
device->info = *physical_device->info;
device->isl_dev = physical_device->isl_dev;
anv_queue_init(device, &device->queue);

View file

@ -428,6 +428,7 @@ struct anv_physical_device {
const struct brw_device_info * info;
uint64_t aperture_size;
struct brw_compiler * compiler;
struct isl_device isl_dev;
};
bool anv_is_scalar_shader_stage(const struct brw_compiler *compiler,
@ -485,6 +486,7 @@ struct anv_device {
struct anv_instance * instance;
uint32_t chipset_id;
struct brw_device_info info;
struct isl_device isl_dev;
int context_id;
int fd;