diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2016-04-21 18:12:48 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2016-04-21 19:36:19 +0200 |
| commit | 38f4cee3ff36970254ddce238638c4b9724669e3 (patch) | |
| tree | d37315fc6633e11f70d3a52c29947e2f4395f2fb /src/gallium/drivers/radeonsi/si_shader.c | |
| parent | 1bc983cd649af10d87500ceda37d7a36aa3741a6 (diff) | |
radeonsi: Add config parameter to si_shader_apply_scratch_relocs.
shader->config is not updated for compute kernels.
Signed-off-by: Bas Nieuwenhuizen <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 3bf68eb025d..c48ae3b5636 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -5394,13 +5394,14 @@ void si_shader_binary_read_config(struct radeon_shader_binary *binary, void si_shader_apply_scratch_relocs(struct si_context *sctx, struct si_shader *shader, + struct si_shader_config *config, uint64_t scratch_va) { unsigned i; uint32_t scratch_rsrc_dword0 = scratch_va; uint32_t scratch_rsrc_dword1 = S_008F04_BASE_ADDRESS_HI(scratch_va >> 32) - | S_008F04_STRIDE(shader->config.scratch_bytes_per_wave / 64); + | S_008F04_STRIDE(config->scratch_bytes_per_wave / 64); for (i = 0 ; i < shader->binary.reloc_count; i++) { const struct radeon_shader_reloc *reloc = |