diff options
| author | Marek Olšák <[email protected]> | 2014-09-16 18:40:07 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-09-24 14:48:02 +0200 |
| commit | 8c37c16cbc4fd84bbb648cac2189b02633e3f806 (patch) | |
| tree | af84f8ff6b09769c36006d6ac4b10aaa0991491a /src/gallium/drivers/radeonsi/si_compute.c | |
| parent | 07c0b4d9b779dd43fcd3cfc119b1dc0150ab07d2 (diff) | |
radeonsi: merge si_pipe_shader into si_shader
One is part of the other anyway.
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_compute.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index fc842d43719..049f6c251e1 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -45,7 +45,7 @@ struct si_pipe_compute { unsigned private_size; unsigned input_size; unsigned num_kernels; - struct si_pipe_shader *kernels; + struct si_shader *kernels; unsigned num_user_sgprs; struct r600_resource *input_buffer; @@ -77,7 +77,7 @@ static void *si_create_compute_state( program->num_kernels = radeon_llvm_get_num_kernels(program->llvm_ctx, code, header->num_bytes); - program->kernels = CALLOC(sizeof(struct si_pipe_shader), + program->kernels = CALLOC(sizeof(struct si_shader), program->num_kernels); for (i = 0; i < program->num_kernels; i++) { LLVMModuleRef mod = radeon_llvm_get_kernel_module(program->llvm_ctx, i, @@ -181,7 +181,7 @@ static void si_launch_grid( uint64_t shader_va; unsigned arg_user_sgpr_count = NUM_USER_SGPRS; unsigned i; - struct si_pipe_shader *shader = &program->kernels[pc]; + struct si_shader *shader = &program->kernels[pc]; unsigned lds_blocks; unsigned num_waves_for_scratch; |