OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Don't re-upload shaders when merging

Browse Source 
Using anv_pipeline_cache_upload_kernel() will re-upload the kernel and
prog_data when we merge caches. Since the kernel and prog_data is
already in the program_stream, use anv_pipeline_cache_add_entry()
instead to only add the entry to the hash table.
This commit is contained in:
Kristian Høgsberg Kristensen
2016-03-04 12:27:31 -08:00
parent 626559ed37
commit 584f39c65e
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/intel/vulkan/anv_pipeline_cache.c
View File

@@ -406,23 +406,17 @@ anv_pipeline_cache_merge(struct anv_pipeline_cache *dst,
struct anv_pipeline_cache *src) struct anv_pipeline_cache *src)
{ {
for (uint32_t i = 0; i < src->table_size; i++) { for (uint32_t i = 0; i < src->table_size; i++) {
if (src->hash_table[i] == ~0) const uint32_t offset = src->hash_table[i];
if (offset == ~0)
continue; continue;
struct cache_entry *entry = struct cache_entry *entry =
src->program_stream.block_pool->map + src->hash_table[i]; src->program_stream.block_pool->map + offset;
if (anv_pipeline_cache_search(dst, entry->sha1, NULL) != NO_KERNEL) if (anv_pipeline_cache_search(dst, entry->sha1, NULL) != NO_KERNEL)
continue; continue;
const void *kernel = (void *) entry + anv_pipeline_cache_add_entry(dst, entry, offset);
align_u32(sizeof(*entry) + entry->prog_data_size, 64);
const struct brw_stage_prog_data *prog_data =
(const struct brw_stage_prog_data *) entry->prog_data;
anv_pipeline_cache_upload_kernel(dst, entry->sha1,
kernel, entry->kernel_size,
&prog_data, entry->prog_data_size);
} }
} }