[Mesa-dev] [PATCH 2/2] intel, nir: Delete shader_info::double_inputs

[Jason Ekstrand]

The one user of this, anv, no longer needs it so lets drop it.
---
 src/compiler/nir/nir_gather_info.c | 14 --------------
 src/compiler/shader_info.h         |  5 -----
 src/intel/compiler/brw_compiler.h  |  1 -
 src/intel/compiler/brw_vec4.cpp    |  2 --
 4 files changed, 22 deletions(-)

diff --git a/src/compiler/nir/nir_gather_info.c 
b/src/compiler/nir/nir_gather_info.c
index 30f0bc721d4..17fc7976bf8 100644
--- a/src/compiler/nir/nir_gather_info.c
+++ b/src/compiler/nir/nir_gather_info.c
@@ -223,17 +223,6 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, 
nir_shader *shader,
 
          if (!try_mask_partial_io(shader, var, deref, is_output_read))
             mark_whole_variable(shader, var, is_output_read);
-
-         /* We need to track which input_reads bits correspond to a
-          * dvec3/dvec4 input attribute */
-         if (shader->info.stage == MESA_SHADER_VERTEX &&
-             var->data.mode == nir_var_shader_in &&
-             glsl_type_is_dual_slot(glsl_without_array(var->type))) {
-            for (unsigned i = 0; i < glsl_count_attribute_slots(var->type, 
false); i++) {
-               int idx = var->data.location + i;
-               shader->info.vs.double_inputs |= BITFIELD64_BIT(idx);
-            }
-         }
       }
       break;
    }
@@ -396,9 +385,6 @@ nir_shader_gather_info(nir_shader *shader, 
nir_function_impl *entrypoint)
    shader->info.patch_inputs_read = 0;
    shader->info.patch_outputs_written = 0;
    shader->info.system_values_read = 0;
-   if (shader->info.stage == MESA_SHADER_VERTEX) {
-      shader->info.vs.double_inputs = 0;
-   }
    if (shader->info.stage == MESA_SHADER_FRAGMENT) {
       shader->info.fs.uses_sample_qualifier = false;
    }
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index 65bc0588d67..aa94baa977e 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -131,11 +131,6 @@ typedef struct shader_info {
    bool has_transform_feedback_varyings;
 
    union {
-      struct {
-         /* Which inputs are doubles */
-         uint64_t double_inputs;
-      } vs;
-
       struct {
          /** The number of vertices recieves per input primitive */
          unsigned vertices_in;
diff --git a/src/intel/compiler/brw_compiler.h 
b/src/intel/compiler/brw_compiler.h
index d8c9499065f..30a14e2bfa4 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -1063,7 +1063,6 @@ struct brw_vs_prog_data {
    struct brw_vue_prog_data base;
 
    GLbitfield64 inputs_read;
-   GLbitfield64 double_inputs_read;
 
    unsigned nr_attribute_slots;
 
diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp
index 4e242e03032..a76eda40033 100644
--- a/src/intel/compiler/brw_vec4.cpp
+++ b/src/intel/compiler/brw_vec4.cpp
@@ -2833,8 +2833,6 @@ brw_compile_vs(const struct brw_compiler *compiler, void 
*log_data,
    }
 
    prog_data->inputs_read = shader->info.inputs_read;
-   prog_data->double_inputs_read = shader->info.vs.double_inputs;
-
    brw_nir_lower_vs_inputs(shader, key->gl_attrib_wa_flags);
    brw_nir_lower_vue_outputs(shader);
    shader = brw_postprocess_nir(shader, compiler, is_scalar);
-- 
2.17.1

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