struct anv_shader_bin *
anv_shader_bin_create(struct anv_device *device,
+ gl_shader_stage stage,
const void *key_data, uint32_t key_size,
const void *kernel_data, uint32_t kernel_size,
const void *constant_data, uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data_in,
- uint32_t prog_data_size, const void *prog_data_param_in,
+ uint32_t prog_data_size,
const struct brw_compile_stats *stats, uint32_t num_stats,
const nir_xfb_info *xfb_info_in,
const struct anv_pipeline_bind_map *bind_map)
anv_multialloc_add(&ma, &sampler_to_descriptor,
bind_map->sampler_count);
- if (!anv_multialloc_alloc(&ma, &device->alloc,
+ if (!anv_multialloc_alloc(&ma, &device->vk.alloc,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE))
return NULL;
shader->ref_cnt = 1;
+ shader->stage = stage;
+
key->size = key_size;
memcpy(key->data, key_data, key_size);
shader->key = key;
shader->constant_data_size = constant_data_size;
memcpy(prog_data, prog_data_in, prog_data_size);
- memcpy(prog_data_param, prog_data_param_in,
+ memset(prog_data_param, 0,
prog_data->nr_params * sizeof(*prog_data_param));
prog_data->param = prog_data_param;
shader->prog_data = prog_data;
assert(shader->ref_cnt == 0);
anv_state_pool_free(&device->instruction_state_pool, shader->kernel);
anv_state_pool_free(&device->dynamic_state_pool, shader->constant_data);
- vk_free(&device->alloc, shader);
+ vk_free(&device->vk.alloc, shader);
}
static bool
anv_shader_bin_write_to_blob(const struct anv_shader_bin *shader,
struct blob *blob)
{
+ blob_write_uint32(blob, shader->stage);
+
blob_write_uint32(blob, shader->key->size);
blob_write_bytes(blob, shader->key->data, shader->key->size);
blob_write_uint32(blob, shader->prog_data_size);
blob_write_bytes(blob, shader->prog_data, shader->prog_data_size);
- blob_write_bytes(blob, shader->prog_data->param,
- shader->prog_data->nr_params *
- sizeof(*shader->prog_data->param));
blob_write_uint32(blob, shader->num_stats);
blob_write_bytes(blob, shader->stats,
blob_write_uint32(blob, 0);
}
+ blob_write_bytes(blob, shader->bind_map.surface_sha1,
+ sizeof(shader->bind_map.surface_sha1));
+ blob_write_bytes(blob, shader->bind_map.sampler_sha1,
+ sizeof(shader->bind_map.sampler_sha1));
+ blob_write_bytes(blob, shader->bind_map.push_sha1,
+ sizeof(shader->bind_map.push_sha1));
blob_write_uint32(blob, shader->bind_map.surface_count);
blob_write_uint32(blob, shader->bind_map.sampler_count);
blob_write_bytes(blob, shader->bind_map.surface_to_descriptor,
blob_write_bytes(blob, shader->bind_map.sampler_to_descriptor,
shader->bind_map.sampler_count *
sizeof(*shader->bind_map.sampler_to_descriptor));
+ blob_write_bytes(blob, shader->bind_map.push_ranges,
+ sizeof(shader->bind_map.push_ranges));
return !blob->out_of_memory;
}
anv_shader_bin_create_from_blob(struct anv_device *device,
struct blob_reader *blob)
{
+ gl_shader_stage stage = blob_read_uint32(blob);
+
uint32_t key_size = blob_read_uint32(blob);
const void *key_data = blob_read_bytes(blob, key_size);
blob_read_bytes(blob, prog_data_size);
if (blob->overrun)
return NULL;
- const void *prog_data_param =
- blob_read_bytes(blob, prog_data->nr_params * sizeof(*prog_data->param));
uint32_t num_stats = blob_read_uint32(blob);
const struct brw_compile_stats *stats =
xfb_info = blob_read_bytes(blob, xfb_size);
struct anv_pipeline_bind_map bind_map;
+ blob_copy_bytes(blob, bind_map.surface_sha1, sizeof(bind_map.surface_sha1));
+ blob_copy_bytes(blob, bind_map.sampler_sha1, sizeof(bind_map.sampler_sha1));
+ blob_copy_bytes(blob, bind_map.push_sha1, sizeof(bind_map.push_sha1));
bind_map.surface_count = blob_read_uint32(blob);
bind_map.sampler_count = blob_read_uint32(blob);
bind_map.surface_to_descriptor = (void *)
bind_map.sampler_to_descriptor = (void *)
blob_read_bytes(blob, bind_map.sampler_count *
sizeof(*bind_map.sampler_to_descriptor));
+ blob_copy_bytes(blob, bind_map.push_ranges, sizeof(bind_map.push_ranges));
if (blob->overrun)
return NULL;
- return anv_shader_bin_create(device,
+ return anv_shader_bin_create(device, stage,
key_data, key_size,
kernel_data, kernel_size,
constant_data, constant_data_size,
- prog_data, prog_data_size, prog_data_param,
+ prog_data, prog_data_size,
stats, num_stats, xfb_info, &bind_map);
}
struct anv_device *device,
bool cache_enabled)
{
+ vk_object_base_init(&device->vk, &cache->base,
+ VK_OBJECT_TYPE_PIPELINE_CACHE);
cache->device = device;
pthread_mutex_init(&cache->mutex, NULL);
_mesa_hash_table_destroy(cache->nir_cache, NULL);
}
+
+ vk_object_base_finish(&cache->base);
}
static struct anv_shader_bin *
static struct anv_shader_bin *
anv_pipeline_cache_add_shader_locked(struct anv_pipeline_cache *cache,
+ gl_shader_stage stage,
const void *key_data, uint32_t key_size,
const void *kernel_data,
uint32_t kernel_size,
uint32_t constant_data_size,
const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
- const void *prog_data_param,
const struct brw_compile_stats *stats,
uint32_t num_stats,
const nir_xfb_info *xfb_info,
return shader;
struct anv_shader_bin *bin =
- anv_shader_bin_create(cache->device, key_data, key_size,
+ anv_shader_bin_create(cache->device, stage,
+ key_data, key_size,
kernel_data, kernel_size,
constant_data, constant_data_size,
- prog_data, prog_data_size, prog_data_param,
+ prog_data, prog_data_size,
stats, num_stats, xfb_info, bind_map);
if (!bin)
return NULL;
struct anv_shader_bin *
anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache *cache,
+ gl_shader_stage stage,
const void *key_data, uint32_t key_size,
const void *kernel_data, uint32_t kernel_size,
const void *constant_data,
pthread_mutex_lock(&cache->mutex);
struct anv_shader_bin *bin =
- anv_pipeline_cache_add_shader_locked(cache, key_data, key_size,
+ anv_pipeline_cache_add_shader_locked(cache, stage, key_data, key_size,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size,
- prog_data->param,
stats, num_stats,
xfb_info, bind_map);
return bin;
} else {
/* In this case, we're not caching it so the caller owns it entirely */
- return anv_shader_bin_create(cache->device, key_data, key_size,
+ return anv_shader_bin_create(cache->device, stage,
+ key_data, key_size,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size,
- prog_data->param,
stats, num_stats,
xfb_info, bind_map);
}
const void *data, size_t size)
{
struct anv_device *device = cache->device;
- struct anv_physical_device *pdevice = &device->instance->physicalDevice;
+ struct anv_physical_device *pdevice = device->physical;
if (cache->cache == NULL)
return;
return;
if (header.vendor_id != 0x8086)
return;
- if (header.device_id != device->chipset_id)
+ if (header.device_id != device->info.chipset_id)
return;
if (memcmp(header.uuid, pdevice->pipeline_cache_uuid, VK_UUID_SIZE) != 0)
return;
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO);
assert(pCreateInfo->flags == 0);
- cache = vk_alloc2(&device->alloc, pAllocator,
+ cache = vk_alloc2(&device->vk.alloc, pAllocator,
sizeof(*cache), 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (cache == NULL)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
anv_pipeline_cache_init(cache, device,
- device->instance->pipeline_cache_enabled);
+ device->physical->instance->pipeline_cache_enabled);
if (pCreateInfo->initialDataSize > 0)
anv_pipeline_cache_load(cache,
anv_pipeline_cache_finish(cache);
- vk_free2(&device->alloc, pAllocator, cache);
+ vk_free2(&device->vk.alloc, pAllocator, cache);
}
VkResult anv_GetPipelineCacheData(
{
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_pipeline_cache, cache, _cache);
- struct anv_physical_device *pdevice = &device->instance->physicalDevice;
struct blob blob;
if (pData) {
.header_size = sizeof(struct cache_header),
.header_version = VK_PIPELINE_CACHE_HEADER_VERSION_ONE,
.vendor_id = 0x8086,
- .device_id = device->chipset_id,
+ .device_id = device->info.chipset_id,
};
- memcpy(header.uuid, pdevice->pipeline_cache_uuid, VK_UUID_SIZE);
+ memcpy(header.uuid, device->physical->pipeline_cache_uuid, VK_UUID_SIZE);
blob_write_bytes(&blob, &header, sizeof(header));
uint32_t count = 0;
}
#ifdef ENABLE_SHADER_CACHE
- struct disk_cache *disk_cache = device->instance->physicalDevice.disk_cache;
- if (disk_cache && device->instance->pipeline_cache_enabled) {
+ struct disk_cache *disk_cache = device->physical->disk_cache;
+ if (disk_cache && device->physical->instance->pipeline_cache_enabled) {
cache_key cache_key;
disk_cache_compute_key(disk_cache, key_data, key_size, cache_key);
struct anv_shader_bin *
anv_device_upload_kernel(struct anv_device *device,
struct anv_pipeline_cache *cache,
+ gl_shader_stage stage,
const void *key_data, uint32_t key_size,
const void *kernel_data, uint32_t kernel_size,
const void *constant_data,
{
struct anv_shader_bin *bin;
if (cache) {
- bin = anv_pipeline_cache_upload_kernel(cache, key_data, key_size,
+ bin = anv_pipeline_cache_upload_kernel(cache, stage, key_data, key_size,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size,
stats, num_stats,
xfb_info, bind_map);
} else {
- bin = anv_shader_bin_create(device, key_data, key_size,
+ bin = anv_shader_bin_create(device, stage, key_data, key_size,
kernel_data, kernel_size,
constant_data, constant_data_size,
prog_data, prog_data_size,
- prog_data->param,
stats, num_stats,
xfb_info, bind_map);
}
return NULL;
#ifdef ENABLE_SHADER_CACHE
- struct disk_cache *disk_cache = device->instance->physicalDevice.disk_cache;
+ struct disk_cache *disk_cache = device->physical->disk_cache;
if (disk_cache) {
struct blob binary;
blob_init(&binary);
struct blob blob;
blob_init(&blob);
- nir_serialize(&blob, nir);
+ nir_serialize(&blob, nir, false);
if (blob.out_of_memory) {
blob_finish(&blob);
return;
projects / mesa.git / blobdiff