From: Edward O'Callaghan <eocallag...@alterapraxis.com>

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 <eocallag...@alterapraxis.com>
---
 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 6cbfd1b..9d0d76f 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 927bac5..2b99b22 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.4.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to