From 1b01014cbfa1d343a3b84cabfd4759bcc8520ea6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 27 Apr 2017 19:01:44 +0200 Subject: [PATCH] radeonsi/gfx9: also apply scratch relocations to the 1st shader of merged shaders MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- 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 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. */ -- 2.30.2