From: Marek Olšák Date: Thu, 27 Apr 2017 17:01:44 +0000 (+0200) Subject: radeonsi/gfx9: also apply scratch relocations to the 1st shader of merged shaders X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b01014cbfa1d343a3b84cabfd4759bcc8520ea6;p=mesa.git radeonsi/gfx9: also apply scratch relocations to the 1st shader of merged shaders Reviewed-by: Nicolai Hähnle --- diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 7191e4100a1..3a9a6f7fcf9 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -2611,6 +2611,9 @@ static int si_update_scratch_buffer(struct si_context *sctx, assert(sctx->scratch_buffer); + if (shader->previous_stage) + si_shader_apply_scratch_relocs(shader->previous_stage, scratch_va); + si_shader_apply_scratch_relocs(shader, scratch_va); /* Replace the shader bo with a new bo that has the relocs applied. */