radeonsi: remove dead code after ES-GS linkage change

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 56b05cef1a30a86590094daa180b8ece2deec9e3..354d0646b995e483da22a44cad31b016e77e65cd 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -163,49 +163,6 @@ unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index)
        }
 }
 
-/**
- * Given a semantic name and index of a parameter and a mask of used parameters
- * (inputs or outputs), return the index of the parameter in the list of all
- * used parameters.
- *
- * For example, assume this list of parameters:
- *   POSITION, PSIZE, GENERIC0, GENERIC2
- * which has the mask:
- *   11000000000101
- * Then:
- *   querying POSITION returns 0,
- *   querying PSIZE returns 1,
- *   querying GENERIC0 returns 2,
- *   querying GENERIC2 returns 3.
- *
- * Which can be used as an offset to a parameter buffer in units of vec4s.
- */
-static int get_param_index(unsigned semantic_name, unsigned index,
-                          uint64_t mask)
-{
-       unsigned unique_index = si_shader_io_get_unique_index(semantic_name, index);
-       int i, param_index = 0;
-
-       /* If not present... */
-       if (!((1llu << unique_index) & mask))
-               return -1;
-
-       for (i = 0; mask; i++) {
-               uint64_t bit = 1llu << i;
-
-               if (bit & mask) {
-                       if (i == unique_index)
-                               return param_index;
-
-                       mask &= ~bit;
-                       param_index++;
-               }
-       }
-
-       assert(!"unreachable");
-       return -1;
-}
-
 /**
  * Get the value of a shader input parameter and extract a bitfield.
  */

diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index de69a273ab4a00b0168852472e0dc59d078cba82..3400a03d7bb7d3c4f9226abc98bb53dfc2c94049 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -211,7 +211,6 @@ struct si_shader_selector {
        unsigned        max_gsvs_emit_size;
 
        /* masks of "get_unique_index" bits */
-       uint64_t        inputs_read;
        uint64_t        outputs_written;
        uint32_t        patch_outputs_written;
        uint32_t        ps_colors_written;

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 3bf130d8a36f5ec81038e8208c3b787960ec00a7..7f6511cf01be21459324496cc3c88a30a3c0a27e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -707,19 +707,6 @@ static void *si_create_shader_selector(struct pipe_context *ctx,
 
                sel->gs_input_verts_per_prim =
                        u_vertices_per_prim(sel->info.properties[TGSI_PROPERTY_GS_INPUT_PRIM]);
-
-               for (i = 0; i < sel->info.num_inputs; i++) {
-                       unsigned name = sel->info.input_semantic_name[i];
-                       unsigned index = sel->info.input_semantic_index[i];
-
-                       switch (name) {
-                       case TGSI_SEMANTIC_PRIMID:
-                               break;
-                       default:
-                               sel->inputs_read |=
-                                       1llu << si_shader_io_get_unique_index(name, index);
-                       }
-               }
                break;
 
        case PIPE_SHADER_VERTEX: