diff options
| author | Timothy Arceri <[email protected]> | 2017-02-27 11:24:54 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-02-28 13:20:31 +1100 |
| commit | 503fb134e850c9ceb9189edbb7f6567070ed0d0b (patch) | |
| tree | ede8e9db18aa67ec1552f26ca2dd42fbf14e58f6 /src/gallium/drivers | |
| parent | f0aaa4b3a42d9fd250e1b9d9c53f40b0ea0855ac (diff) | |
radeon/ac: switch to ac_shader_binary_config_start()
For radeonsi we could probably switch to
ac_shader_binary_read_config(). However the functions have
diverged so just share this helper for now.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_compute.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c index 2d5130fa976..2ddcbb37115 100644 --- a/src/gallium/drivers/r600/evergreen_compute.c +++ b/src/gallium/drivers/r600/evergreen_compute.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <errno.h> +#include "ac_binary.h" #include "pipe/p_defines.h" #include "pipe/p_state.h" #include "pipe/p_context.h" @@ -187,7 +188,7 @@ static void r600_shader_binary_read_config(const struct ac_shader_binary *binary { unsigned i; const unsigned char *config = - radeon_shader_binary_config_start(binary, symbol_offset); + ac_shader_binary_config_start(binary, symbol_offset); for (i = 0; i < binary->config_size_per_symbol; i+= 8) { unsigned reg = diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index e51b7c9f978..8e51ae82d52 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -33,13 +33,13 @@ #include "gallivm/lp_bld_arit.h" #include "gallivm/lp_bld_flow.h" #include "gallivm/lp_bld_misc.h" -#include "radeon/radeon_elf_util.h" #include "util/u_memory.h" #include "util/u_string.h" #include "tgsi/tgsi_build.h" #include "tgsi/tgsi_util.h" #include "tgsi/tgsi_dump.h" +#include "ac_binary.h" #include "ac_llvm_util.h" #include "si_shader_internal.h" #include "si_pipe.h" @@ -5756,7 +5756,7 @@ void si_shader_binary_read_config(struct ac_shader_binary *binary, { unsigned i; const unsigned char *config = - radeon_shader_binary_config_start(binary, symbol_offset); + ac_shader_binary_config_start(binary, symbol_offset); bool really_needs_scratch = false; /* LLVM adds SGPR spills to the scratch size. |