diff options
| author | Timothy Arceri <[email protected]> | 2017-02-27 10:50:29 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-02-28 13:20:31 +1100 |
| commit | 69a687189e0381d0ff8c2f079698b8adfbb0a7b1 (patch) | |
| tree | 58a4cbd9d508aa5e52c3a46ff9b177f6f4f5d86b /src/gallium/drivers/radeonsi/si_shader.h | |
| parent | affc8314cb7580414c6ed72aac40997b952b3694 (diff) | |
radeon/ac: switch from radeon_shader_binary to ac_shader_binary
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index fda8cc65085..c38e7f560b6 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -74,8 +74,7 @@ #include "util/u_queue.h" #include "si_state.h" -struct radeon_shader_binary; -struct radeon_shader_reloc; +struct ac_shader_binary; #define SI_MAX_VS_OUTPUTS 40 @@ -529,7 +528,7 @@ struct si_shader { bool is_gs_copy_shader; /* The following data is all that's needed for binary shaders. */ - struct radeon_shader_binary binary; + struct ac_shader_binary binary; struct si_shader_config config; struct si_shader_info info; @@ -543,7 +542,7 @@ struct si_shader { struct si_shader_part { struct si_shader_part *next; union si_shader_part_key key; - struct radeon_shader_binary binary; + struct ac_shader_binary binary; struct si_shader_config config; }; @@ -562,7 +561,7 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm, struct si_shader *shader, struct pipe_debug_callback *debug); int si_compile_llvm(struct si_screen *sscreen, - struct radeon_shader_binary *binary, + struct ac_shader_binary *binary, struct si_shader_config *conf, LLVMTargetMachineRef tm, LLVMModuleRef mod, @@ -582,7 +581,7 @@ void si_shader_apply_scratch_relocs(struct si_context *sctx, struct si_shader *shader, struct si_shader_config *config, uint64_t scratch_va); -void si_shader_binary_read_config(struct radeon_shader_binary *binary, +void si_shader_binary_read_config(struct ac_shader_binary *binary, struct si_shader_config *conf, unsigned symbol_offset); unsigned si_get_spi_shader_z_format(bool writes_z, bool writes_stencil, |