Mesa (master): radeonsi/gfx9: also apply scratch relocations to the 1st shader of merged shaders

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 1b01014cbfa1d343a3b84cabfd4759bcc8520ea6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b01014cbfa1d343a3b84cabfd4759bcc8520ea6

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Apr 27 19:01:44 2017 +0200

radeonsi/gfx9: also apply scratch relocations to the 1st shader of merged shaders

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeonsi/si_state_shaders.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 7191e4100a..3a9a6f7fcf 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. */