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

radeonsi: save the enable_nir option in the shader cache correctly

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Marek Olšák
2019-07-12 15:42:44 -04:00
parent d227b91d2e
commit 98377d3450
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/radeonsi/si_pipe.c
View File

@@ -849,8 +849,12 @@ static void si_disk_cache_create(struct si_screen *sscreen)
DBG(SI_SCHED) | \ DBG(SI_SCHED) | \
DBG(GISEL) | \ DBG(GISEL) | \
DBG(UNSAFE_MATH)) DBG(UNSAFE_MATH))
uint64_t shader_debug_flags = sscreen->debug_flags & uint64_t shader_debug_flags = sscreen->debug_flags & ALL_FLAGS;
ALL_FLAGS;
if (sscreen->options.enable_nir) {
STATIC_ASSERT((ALL_FLAGS & (1u << 31)) == 0);
shader_debug_flags |= 1u << 31;
}
/* Add the high bits of 32-bit addresses, which affects /* Add the high bits of 32-bit addresses, which affects
* how 32-bit addresses are expanded to 64 bits. * how 32-bit addresses are expanded to 64 bits.
@@ -859,9 +863,6 @@ static void si_disk_cache_create(struct si_screen *sscreen)
assert((int16_t)sscreen->info.address32_hi == (int32_t)sscreen->info.address32_hi); assert((int16_t)sscreen->info.address32_hi == (int32_t)sscreen->info.address32_hi);
shader_debug_flags |= (uint64_t)(sscreen->info.address32_hi & 0xffff) << 32; shader_debug_flags |= (uint64_t)(sscreen->info.address32_hi & 0xffff) << 32;
if (sscreen->options.enable_nir)
shader_debug_flags |= 1ull << 48;
sscreen->disk_shader_cache = sscreen->disk_shader_cache =
disk_cache_create(sscreen->info.name, disk_cache_create(sscreen->info.name,
cache_id, cache_id,