diff options
| author | Timothy Arceri <[email protected]> | 2017-02-27 11:06:51 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-02-28 13:20:31 +1100 |
| commit | dc4c551a345dc399e589382cd859812ea0d5bbae (patch) | |
| tree | 25d76e412c3124de430b4d3f8a4c80992e9aba85 /src/gallium | |
| parent | 69a687189e0381d0ff8c2f079698b8adfbb0a7b1 (diff) | |
radeon/ac: switch from radeon_elf_read() to ac_elf_read()
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_compute.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_debug.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c index cf56d048b15..2d5130fa976 100644 --- a/src/gallium/drivers/r600/evergreen_compute.c +++ b/src/gallium/drivers/r600/evergreen_compute.c @@ -251,7 +251,7 @@ static void *evergreen_create_compute_state(struct pipe_context *ctx, header = cso->prog; code = cso->prog + sizeof(struct pipe_llvm_program_header); radeon_shader_binary_init(&shader->binary); - radeon_elf_read(code, header->num_bytes, &shader->binary); + ac_elf_read(code, header->num_bytes, &shader->binary); r600_create_shader(&shader->bc, &shader->binary, &use_kill); /* Upload code + ROdata */ diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index f4efb0df8d3..5097c81780e 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -25,7 +25,6 @@ #include "tgsi/tgsi_parse.h" #include "util/u_memory.h" #include "util/u_upload_mgr.h" -#include "radeon/radeon_elf_util.h" #include "amd_kernel_code_t.h" #include "radeon/r600_cs.h" @@ -160,7 +159,7 @@ static void *si_create_compute_state( header = cso->prog; code = cso->prog + sizeof(struct pipe_llvm_program_header); - radeon_elf_read(code, header->num_bytes, &program->shader.binary); + ac_elf_read(code, header->num_bytes, &program->shader.binary); if (program->use_code_object_v2) { const amd_kernel_code_t *code_object = si_compute_get_code_object(program, 0); diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index f04b8fa155e..1092aa2761a 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -27,7 +27,6 @@ #include "si_pipe.h" #include "sid.h" #include "sid_tables.h" -#include "radeon/radeon_elf_util.h" #include "ddebug/dd_util.h" #include "util/u_memory.h" #include "ac_debug.h" @@ -126,7 +125,7 @@ bool si_replace_shader(unsigned num, struct ac_shader_binary *binary) if (nread != filesize) goto file_error; - radeon_elf_read(buf, filesize, binary); + ac_elf_read(buf, filesize, binary); replaced = true; out_close: diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c index 1ae17afbb2d..f5c672eee8c 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c @@ -238,7 +238,7 @@ unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary, buffer_size = LLVMGetBufferSize(out_buffer); buffer_data = LLVMGetBufferStart(out_buffer); - radeon_elf_read(buffer_data, buffer_size, binary); + ac_elf_read(buffer_data, buffer_size, binary); /* Clean up */ LLVMDisposeMemoryBuffer(out_buffer); |