fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 22:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeon/ac: switch from radeon_elf_read() to ac_elf_read()

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri 2017-02-27 11:06:51 +11:00
parent 69a687189e
commit dc4c551a34
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/r600/evergreen_compute.c
View file

@ -251,7 +251,7 @@ static void *evergreen_create_compute_state(struct pipe_context *ctx,
header = cso->prog; header = cso->prog;
code = cso->prog + sizeof(struct pipe_llvm_program_header); code = cso->prog + sizeof(struct pipe_llvm_program_header);
radeon_shader_binary_init(&shader->binary); 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); r600_create_shader(&shader->bc, &shader->binary, &use_kill);
/* Upload code + ROdata */ /* Upload code + ROdata */

3
src/gallium/drivers/radeonsi/si_compute.c
View file

@ -25,7 +25,6 @@
#include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_parse.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "util/u_upload_mgr.h" #include "util/u_upload_mgr.h"
#include "radeon/radeon_elf_util.h"
#include "amd_kernel_code_t.h" #include "amd_kernel_code_t.h"
#include "radeon/r600_cs.h" #include "radeon/r600_cs.h"
@ -160,7 +159,7 @@ static void *si_create_compute_state(
header = cso->prog; header = cso->prog;
code = cso->prog + sizeof(struct pipe_llvm_program_header); 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) { if (program->use_code_object_v2) {
const amd_kernel_code_t *code_object = const amd_kernel_code_t *code_object =
si_compute_get_code_object(program, 0); si_compute_get_code_object(program, 0);

3
src/gallium/drivers/radeonsi/si_debug.c
View file

@ -27,7 +27,6 @@
#include "si_pipe.h" #include "si_pipe.h"
#include "sid.h" #include "sid.h"
#include "sid_tables.h" #include "sid_tables.h"
#include "radeon/radeon_elf_util.h"
#include "ddebug/dd_util.h" #include "ddebug/dd_util.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "ac_debug.h" #include "ac_debug.h"
@ -126,7 +125,7 @@ bool si_replace_shader(unsigned num, struct ac_shader_binary *binary)
if (nread != filesize) if (nread != filesize)
goto file_error; goto file_error;
radeon_elf_read(buf, filesize, binary); ac_elf_read(buf, filesize, binary);
replaced = true; replaced = true;
out_close: out_close:

2
src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
View file

@ -238,7 +238,7 @@ unsigned si_llvm_compile(LLVMModuleRef M, struct ac_shader_binary *binary,
buffer_size = LLVMGetBufferSize(out_buffer); buffer_size = LLVMGetBufferSize(out_buffer);
buffer_data = LLVMGetBufferStart(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 */ /* Clean up */
LLVMDisposeMemoryBuffer(out_buffer); LLVMDisposeMemoryBuffer(out_buffer);