From 7b6369eb69e688e5bf739dbe60452950a794f55d Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sat, 29 Aug 2015 18:31:06 +1000 Subject: [PATCH] r600g: Remove dead assigment to 'gs_input_prim' in shader state MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Note that 'geometry shader properties' should be carried in the selector state over the shader state in any case. Signed-off-by: Edward O'Callaghan Signed-off-by: Marek Olšák --- src/gallium/drivers/r600/r600_shader.c | 3 --- src/gallium/drivers/r600/r600_shader.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 4c4b6005981..44e41fb30a6 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -2009,9 +2009,6 @@ static int r600_shader_from_tgsi(struct r600_context *rctx, case TGSI_PROPERTY_VS_PROHIBIT_UCPS: /* we don't need this one */ break; - case TGSI_PROPERTY_GS_INPUT_PRIM: - shader->gs_input_prim = property->u[0].Data; - break; case TGSI_PROPERTY_GS_OUTPUT_PRIM: shader->gs_output_prim = property->u[0].Data; break; diff --git a/src/gallium/drivers/r600/r600_shader.h b/src/gallium/drivers/r600/r600_shader.h index 927bac57673..2b99b22a6b2 100644 --- a/src/gallium/drivers/r600/r600_shader.h +++ b/src/gallium/drivers/r600/r600_shader.h @@ -79,7 +79,6 @@ struct r600_shader { boolean uses_index_registers; /* geometry shader properties */ - unsigned gs_input_prim; unsigned gs_output_prim; unsigned gs_max_out_vertices; unsigned gs_num_invocations; -- 2.30.2