From: Marek Olšák Date: Thu, 1 Jun 2017 16:57:37 +0000 (+0200) Subject: radeonsi/gfx9: wait for main part compilation of 1st shaders of merged shaders X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5bc826ead940211982e38c1130055d17b6cd28d;p=mesa.git radeonsi/gfx9: wait for main part compilation of 1st shaders 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 631272efcd6..727bf4bee9a 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -1602,6 +1602,10 @@ again: previous_stage_sel = key->part.tcs.ls; else if (sel->type == PIPE_SHADER_GEOMETRY) previous_stage_sel = key->part.gs.es; + + /* We need to wait for the previous shader. */ + if (previous_stage_sel && thread_index < 0) + util_queue_fence_wait(&previous_stage_sel->ready); } /* Compile the main shader part if it doesn't exist. This can happen