From 7df682c291307c730a56b064b8df2cd5c8b1be82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 19 Apr 2017 03:37:14 +0200 Subject: [PATCH] radeonsi/gfx9: select shader parts for non-monolithic ES-GS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_shader.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 21287ae3ed4..18a3cf15251 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -8636,20 +8636,31 @@ static bool si_shader_select_gs_parts(struct si_screen *sscreen, struct si_shader *shader, struct pipe_debug_callback *debug) { - union si_shader_part_key prolog_key; + if (sscreen->b.chip_class >= GFX9) { + struct si_shader *es_main_part = + shader->key.part.gs.es->main_shader_part_es; + + if (shader->key.part.gs.es->type == PIPE_SHADER_VERTEX && + !si_get_vs_prolog(sscreen, tm, shader, debug, es_main_part, + &shader->key.part.gs.vs_prolog)) + return false; + + shader->previous_stage = es_main_part; + } if (!shader->key.part.gs.prolog.tri_strip_adj_fix) return true; + union si_shader_part_key prolog_key; memset(&prolog_key, 0, sizeof(prolog_key)); prolog_key.gs_prolog.states = shader->key.part.gs.prolog; - shader->prolog = si_get_shader_part(sscreen, &sscreen->gs_prologs, + shader->prolog2 = si_get_shader_part(sscreen, &sscreen->gs_prologs, PIPE_SHADER_GEOMETRY, true, &prolog_key, tm, debug, si_build_gs_prolog_function, "Geometry Shader Prolog"); - return shader->prolog != NULL; + return shader->prolog2 != NULL; } /** -- 2.30.2