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

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

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 7191e4100a18b71dd77023008ede488fa7ea1b40..3a9a6f7fcf92ed50b31b96b3fbb3427e4920e3e4 100644 (file)
--- 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. */