From c5f70a517442ac98861f7c84eb04bbe3b8823a2d Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Fri, 19 May 2017 17:28:54 +0200 Subject: radeonsi: bypass the shader cache for NIR shaders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_state_shaders.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 07c6d43b759..5a0ead1313a 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1800,7 +1800,7 @@ void si_init_shader_selector_async(void *job, int thread_index) */ if (!sscreen->use_monolithic_shaders) { struct si_shader *shader = CALLOC_STRUCT(si_shader); - void *tgsi_binary; + void *tgsi_binary = NULL; if (!shader) { fprintf(stderr, "radeonsi: can't allocate a main shader part\n"); @@ -1810,7 +1810,8 @@ void si_init_shader_selector_async(void *job, int thread_index) shader->selector = sel; si_parse_next_shader_property(&sel->info, &shader->key); - tgsi_binary = si_get_tgsi_binary(sel); + if (sel->tokens) + tgsi_binary = si_get_tgsi_binary(sel); /* Try to load the shader from the shader cache. */ mtx_lock(&sscreen->shader_cache_mutex); -- cgit v1.2.3