KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radv: don't crash if cache is disabled. 

If you set MESA_GLSL_CACHE_DISABLE, radv crashed.

Fixes: fd24be134f (radv: make use of on-disk cache)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Dave Airlie 2017-10-12 14:24:41 +10:00 committed by Samuel Pitoiset
parent 4f42ea4dcf
commit 6049fa454e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/amd/vulkan/radv_pipeline_cache.c
View File

@ -167,6 +167,8 @@ radv_create_shader_variant_from_pipeline_cache(struct radv_device *device,
entry = radv_pipeline_cache_search(device->mem_cache, sha1);
if (!entry) {
if (!device->physical_device->disk_cache)
return NULL;
uint8_t disk_sha1[20];
disk_cache_compute_key(device->physical_device->disk_cache,
sha1, 20, disk_sha1);
@ -317,11 +319,13 @@ radv_pipeline_cache_insert_shader(struct radv_device *device,
* compiled shaders by third parties such as steam, even if the app
* implements its own pipeline cache.
*/
uint8_t disk_sha1[20];
disk_cache_compute_key(device->physical_device->disk_cache, sha1, 20,
disk_sha1);
disk_cache_put(device->physical_device->disk_cache,
disk_sha1, entry, entry_size(entry), NULL);
if (device->physical_device->disk_cache) {
uint8_t disk_sha1[20];
disk_cache_compute_key(device->physical_device->disk_cache, sha1, 20,
disk_sha1);
disk_cache_put(device->physical_device->disk_cache,
disk_sha1, entry, entry_size(entry), NULL);
}
entry->variant = variant;
p_atomic_inc(&variant->ref_count);