radeon/ac: switch from radeon_elf_read() to ac_elf_read()
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
parent
69a687189e
commit
dc4c551a34
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue