fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 20:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: don't check sel->nir in si_init_shader_selector_async

Browse source 
It's always non-NULL.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34492>
This commit is contained in:
Marek Olšák 2025-04-10 13:06:13 -04:00 • committed by Marge Bot
parent 6e4154b7ef
commit f5bc1ebc11
1 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View file

@ -3400,21 +3400,20 @@ static void si_init_shader_selector_async(void *job, void *gdata, int thread_ind
/* Serialize NIR to save memory. Monolithic shader variants
* have to deserialize NIR before compilation.
*/
if (sel->nir) {
struct blob blob;
size_t size;
struct blob blob;
size_t size;
assert(sel->nir);
blob_init(&blob);
/* true = remove optional debugging data to increase
* the likehood of getting more shader cache hits.
* It also drops variable names, so we'll save more memory.
* If NIR debug prints are used we don't strip to get more
* useful logs.
*/
nir_serialize(&blob, sel->nir, NIR_DEBUG(PRINT) == 0);
blob_finish_get_buffer(&blob, &sel->nir_binary, &size);
sel->nir_size = size;
}
blob_init(&blob);
/* true = remove optional debugging data to increase
* the likehood of getting more shader cache hits.
* It also drops variable names, so we'll save more memory.
* If NIR debug prints are used we don't strip to get more
* useful logs.
*/
nir_serialize(&blob, sel->nir, NIR_DEBUG(PRINT) == 0);
blob_finish_get_buffer(&blob, &sel->nir_binary, &size);
sel->nir_size = size;
/* Compile the main shader part for use with a prolog and/or epilog.
* If this fails, the driver will try to compile a monolithic shader
@ -3449,13 +3448,11 @@ static void si_init_shader_selector_async(void *job, void *gdata, int thread_ind
shader->wave_size = si_determine_wave_size(sscreen, shader);
if (sel->nir) {
if (sel->stage <= MESA_SHADER_GEOMETRY) {
si_get_ir_cache_key(sel, shader->key.ge.as_ngg, shader->key.ge.as_es,
shader->wave_size, ir_sha1_cache_key);
} else {
si_get_ir_cache_key(sel, false, false, shader->wave_size, ir_sha1_cache_key);
}
if (sel->stage <= MESA_SHADER_GEOMETRY) {
si_get_ir_cache_key(sel, shader->key.ge.as_ngg, shader->key.ge.as_es,
shader->wave_size, ir_sha1_cache_key);
} else {
si_get_ir_cache_key(sel, false, false, shader->wave_size, ir_sha1_cache_key);
}
/* Try to load the shader from the shader cache. */
@ -3524,10 +3521,8 @@ static void si_init_shader_selector_async(void *job, void *gdata, int thread_ind
}
/* Free NIR. We only keep serialized NIR after this point. */
if (sel->nir) {
ralloc_free(sel->nir);
sel->nir = NULL;
}
ralloc_free(sel->nir);
sel->nir = NULL;
}
void si_schedule_initial_compile(struct si_context *sctx, gl_shader_stage stage,