radeonsi: rename si_shader_create -> si_create_shader_variant for clarity
authorMarek Olšák <marek.olsak@amd.com>
Sat, 11 Jan 2020 01:13:54 +0000 (20:13 -0500)
committerMarek Olšák <marek.olsak@amd.com>
Tue, 14 Jan 2020 23:46:07 +0000 (18:46 -0500)
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
src/gallium/drivers/radeonsi/si_compute.c
src/gallium/drivers/radeonsi/si_shader.c
src/gallium/drivers/radeonsi/si_shader.h
src/gallium/drivers/radeonsi/si_state_shaders.c

index eed755b6586e006fb7089610971fb16f51d65a5d..25e08c6f428c30f591c3e5f96db5854ca1c40711 100644 (file)
@@ -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;
                }
index 37b85bf70f9195f7b7638b0d4ccf3f997442c1ed..8e3b23e8109109176aaea1b0296b01d1ff0cede9 100644 (file)
@@ -7057,9 +7057,10 @@ static void si_fix_resource_usage(struct si_screen *sscreen,
        }
 }
 
-bool si_shader_create(struct si_screen *sscreen, struct ac_llvm_compiler *compiler,
-                    struct si_shader *shader,
-                    struct pipe_debug_callback *debug)
+bool si_create_shader_variant(struct si_screen *sscreen,
+                             struct ac_llvm_compiler *compiler,
+                             struct si_shader *shader,
+                             struct pipe_debug_callback *debug)
 {
        struct si_shader_selector *sel = shader->selector;
        struct si_shader *mainp = *si_get_main_shader_part(sel, &shader->key);
index 633f59d2620d3b82df91ebbb2d05b87abd4dc3c9..c4792da4782e06190af1bb6231a2f66fd33019b7 100644 (file)
@@ -823,9 +823,10 @@ int si_compile_shader(struct si_screen *sscreen,
                      struct ac_llvm_compiler *compiler,
                      struct si_shader *shader,
                      struct pipe_debug_callback *debug);
-bool si_shader_create(struct si_screen *sscreen, struct ac_llvm_compiler *compiler,
-                    struct si_shader *shader,
-                    struct pipe_debug_callback *debug);
+bool si_create_shader_variant(struct si_screen *sscreen,
+                             struct ac_llvm_compiler *compiler,
+                             struct si_shader *shader,
+                             struct pipe_debug_callback *debug);
 void si_shader_destroy(struct si_shader *shader);
 unsigned si_shader_io_get_unique_index_patch(unsigned semantic_name, unsigned index);
 unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index,
index b4fd6a58b11930b7cb29788005c2e43250a4a22c..96e6f88bb575d1d2a0be12bfb4319cfc5a7f9148 100644 (file)
@@ -2110,7 +2110,7 @@ static void si_build_shader_variant(struct si_shader *shader,
        if (!compiler->passes)
                si_init_compiler(sscreen, compiler);
 
-       if (unlikely(!si_shader_create(sscreen, compiler, shader, debug))) {
+       if (unlikely(!si_create_shader_variant(sscreen, compiler, shader, debug))) {
                PRINT_ERR("Failed to build shader variant (type=%u)\n",
                          sel->type);
                shader->compilation_failed = true;