Module: Mesa
Branch: master
Commit: 42112010a393bc2f0e0fe41263c613a05b915833
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=42112010a393bc2f0e0fe41263c613a05b915833
Author: Marek Olšák <marek.ol...@amd.com>
Date: Fri Jan 10 20:13:54 2020 -0500
radeonsi: rename si_shader_create -> si_create_shader_variant for clarity
Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>
---
src/gallium/drivers/radeonsi/si_compute.c | 2 +-
src/gallium/drivers/radeonsi/si_shader.c | 7 ++++---
src/gallium/drivers/radeonsi/si_shader.h | 7 ++++---
src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_compute.c
b/src/gallium/drivers/radeonsi/si_compute.c
index eed755b6586..25e08c6f428 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -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;
}
diff --git a/src/gallium/drivers/radeonsi/si_shader.c
b/src/gallium/drivers/radeonsi/si_shader.c
index 37b85bf70f9..8e3b23e8109 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -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);
diff --git a/src/gallium/drivers/radeonsi/si_shader.h
b/src/gallium/drivers/radeonsi/si_shader.h
index 633f59d2620..c4792da4782 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -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,
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c
b/src/gallium/drivers/radeonsi/si_state_shaders.c
index b4fd6a58b11..96e6f88bb57 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -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;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
