fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radeonsi/compute: Rename si_compute::program to si_compute::shader

Browse source 
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Tom Stellard 2015-01-23 22:54:08 +00:00
parent 5935edd47c
commit 37559f8dfc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ struct si_compute {
unsigned private_size; unsigned private_size;
unsigned input_size; unsigned input_size;
struct radeon_shader_binary binary; struct radeon_shader_binary binary;
struct si_shader program; struct si_shader shader;
unsigned num_user_sgprs; unsigned num_user_sgprs;
struct r600_resource *input_buffer; struct r600_resource *input_buffer;
@ -103,7 +103,7 @@ static void *si_create_compute_state(
#else #else
radeon_elf_read(code, header->num_bytes, &program->binary, true); radeon_elf_read(code, header->num_bytes, &program->binary, true);
si_shader_binary_read(sctx->screen, &program->program, &program->binary); si_shader_binary_read(sctx->screen, &program->shader, &program->binary);
#endif #endif
program->input_buffer = si_resource_create_custom(sctx->b.b.screen, program->input_buffer = si_resource_create_custom(sctx->b.b.screen,
@ -231,7 +231,7 @@ static void si_launch_grid(
uint64_t shader_va; uint64_t shader_va;
unsigned arg_user_sgpr_count = NUM_USER_SGPRS; unsigned arg_user_sgpr_count = NUM_USER_SGPRS;
unsigned i; unsigned i;
struct si_shader *shader = &program->program; struct si_shader *shader = &program->shader;
unsigned lds_blocks; unsigned lds_blocks;
unsigned num_waves_for_scratch; unsigned num_waves_for_scratch;
@ -256,7 +256,7 @@ static void si_launch_grid(
#if HAVE_LLVM >= 0x0306 #if HAVE_LLVM >= 0x0306
/* Read the config information */ /* Read the config information */
si_shader_binary_read_config(&program->binary, &program->program, pc); si_shader_binary_read_config(&program->binary, shader, pc);
#endif #endif
/* Upload the kernel arguments */ /* Upload the kernel arguments */
@ -475,7 +475,7 @@ static void si_delete_compute_state(struct pipe_context *ctx, void* state){
LLVMContextDispose(program->llvm_ctx); LLVMContextDispose(program->llvm_ctx);
} }
#else #else
si_shader_destroy(ctx, &program->program); si_shader_destroy(ctx, &program->shader);
#endif #endif
pipe_resource_reference( pipe_resource_reference(