radeonsi/gfx10: merge main and pos/param export IF blocks into one if possible

[mesa.git] / src / gallium / drivers / radeonsi / si_compute.c

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index f264b880d291defd784bc5ea76af7a172bf8ec0a..25e08c6f428c30f591c3e5f96db5854ca1c40711 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -126,7 +126,7 @@ static void si_create_compute_state_async(void *job, int thread_index)
        assert(program->ir_type == PIPE_SHADER_IR_NIR);
        si_nir_scan_shader(sel->nir, &sel->info);
 
-       /* Store the declared LDS size into tgsi_shader_info for the shader
+       /* Store the declared LDS size into si_shader_info for the shader
         * cache to include it.
         */
        sel->info.properties[TGSI_PROPERTY_CS_LOCAL_SIZE] = program->local_size;
@@ -159,7 +159,7 @@ static void si_create_compute_state_async(void *job, int thread_index)
        } else {
                simple_mtx_unlock(&sscreen->shader_cache_mutex);
 
-               if (!si_shader_create(sscreen, compiler, &program->shader, debug)) {
+               if (!si_create_shader_variant(sscreen, compiler, &program->shader, debug)) {
                        program->shader.compilation_failed = true;
                        return;
                }