From 7991d602f370a1bf7ff5040ea3ee2572ee1c76ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 8 Dec 2014 12:41:37 +0100 Subject: [PATCH] radeonsi: fix line stippling and provoking vertex state for GS primitives MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I'm not sure if GS hw outputs line lists or line strips. Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeonsi/si_state_draw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 195d981..4383da4 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -153,7 +153,9 @@ static void si_emit_rasterizer_prim_state(struct si_context *sctx, unsigned mode { struct radeon_winsys_cs *cs = sctx->b.rings.gfx.cs; - /* TODO: this should use the GS output primitive type. */ + if (sctx->gs_shader) + mode = sctx->gs_shader->gs_output_prim; + r600_write_context_reg(cs, R_028A0C_PA_SC_LINE_STIPPLE, sctx->pa_sc_line_stipple | S_028A0C_AUTO_RESET_CNTL(mode == PIPE_PRIM_LINES ? 1 : -- 2.7.4