nir: Move nir_lower_mediump_outputs from ir3

[mesa.git] / src / compiler / nir / nir_lower_two_sided_color.c

diff --git a/src/compiler/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c
index 5d8779e14cf1a0856f85b62ee737bcdbf9cbd93f..04bb5d1ec76e7e23e7692cac75d67976b4259183 100644 (file)
--- a/src/compiler/nir/nir_lower_two_sided_color.c
+++ b/src/compiler/nir/nir_lower_two_sided_color.c
@@ -32,7 +32,6 @@
 typedef struct {
    nir_builder   b;
    nir_shader   *shader;
-   nir_variable *face;
    struct {
       nir_variable *front;        /* COLn */
       nir_variable *back;         /* BFCn */
@@ -47,21 +46,21 @@ typedef struct {
  */
 
 static nir_variable *
-create_input(nir_shader *shader, unsigned drvloc, gl_varying_slot slot)
+create_input(nir_shader *shader, gl_varying_slot slot,
+             enum glsl_interp_mode interpolation)
 {
    nir_variable *var = rzalloc(shader, nir_variable);
 
-   var->data.driver_location = drvloc;
+   var->data.driver_location = shader->num_inputs++;
    var->type = glsl_vec4_type();
    var->data.mode = nir_var_shader_in;
-   var->name = ralloc_asprintf(var, "in_%d", drvloc);
+   var->name = ralloc_asprintf(var, "in_%d", var->data.driver_location);
    var->data.index = 0;
    var->data.location = slot;
+   var->data.interpolation = interpolation;
 
    exec_list_push_tail(&shader->inputs, &var->node);
 
-   shader->num_inputs++;     /* TODO use type_size() */
-
    return var;
 }
 
@@ -83,17 +82,8 @@ load_input(nir_builder *b, nir_variable *in)
 static int
 setup_inputs(lower_2side_state *state)
 {
-   int maxloc = -1;
-
-   /* find color/face inputs: */
+   /* find color inputs: */
    nir_foreach_variable(var, &state->shader->inputs) {
-      int loc = var->data.driver_location;
-
-      /* keep track of last used driver-location.. we'll be
-       * appending BCLr/FACE after last existing input:
-       */
-      maxloc = MAX2(maxloc, loc);
-
       switch (var->data.location) {
       case VARYING_SLOT_COL0:
       case VARYING_SLOT_COL1:
@@ -101,9 +91,6 @@ setup_inputs(lower_2side_state *state)
          state->colors[state->colors_count].front = var;
          state->colors_count++;
          break;
-      case VARYING_SLOT_FACE:
-         state->face = var;
-         break;
       }
    }
 
@@ -111,12 +98,6 @@ setup_inputs(lower_2side_state *state)
    if (state->colors_count == 0)
       return -1;
 
-   /* if we don't already have one, insert a FACE input: */
-   if (!state->face) {
-      state->face = create_input(state->shader, ++maxloc, VARYING_SLOT_FACE);
-      state->face->data.interpolation = INTERP_QUALIFIER_FLAT;
-   }
-
    /* add required back-face color inputs: */
    for (int i = 0; i < state->colors_count; i++) {
       gl_varying_slot slot;
@@ -126,7 +107,9 @@ setup_inputs(lower_2side_state *state)
       else
          slot = VARYING_SLOT_BFC1;
 
-      state->colors[i].back = create_input(state->shader, ++maxloc, slot);
+      state->colors[i].back = create_input(
+            state->shader, slot,
+            state->colors[i].front->data.interpolation);
    }
 
    return 0;
@@ -144,31 +127,49 @@ nir_lower_two_sided_color_block(nir_block *block,
 
       nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
 
-      if (intr->intrinsic != nir_intrinsic_load_input)
-         continue;
-
       int idx;
-      for (idx = 0; idx < state->colors_count; idx++) {
-         unsigned drvloc =
-            state->colors[idx].front->data.driver_location;
-         if (nir_intrinsic_base(intr) == drvloc) {
-            assert(nir_src_as_const_value(intr->src[0]));
-            break;
+      if (intr->intrinsic == nir_intrinsic_load_input) {
+         for (idx = 0; idx < state->colors_count; idx++) {
+            unsigned drvloc =
+               state->colors[idx].front->data.driver_location;
+            if (nir_intrinsic_base(intr) == drvloc) {
+               assert(nir_src_is_const(intr->src[0]));
+               break;
+            }
          }
-      }
+      } else if (intr->intrinsic == nir_intrinsic_load_deref) {
+         nir_variable *var = nir_intrinsic_get_var(intr, 0);
+         if (var->data.mode != nir_var_shader_in)
+            continue;
+
+         for (idx = 0; idx < state->colors_count; idx++) {
+            unsigned loc = state->colors[idx].front->data.location;
+            if (var->data.location == loc)
+               break;
+         }
+      } else
+         continue;
 
       if (idx == state->colors_count)
          continue;
 
       /* replace load_input(COLn) with
-       * bcsel(load_input(FACE), load_input(COLn), load_input(BFCn))
+       * bcsel(load_system_value(FACE), load_input(COLn), load_input(BFCn))
        */
       b->cursor = nir_before_instr(&intr->instr);
-      nir_ssa_def *face  = nir_channel(b, load_input(b, state->face), 0);
-      nir_ssa_def *front = load_input(b, state->colors[idx].front);
-      nir_ssa_def *back  = load_input(b, state->colors[idx].back);
-      nir_ssa_def *cond  = nir_flt(b, face, nir_imm_float(b, 0.0));
-      nir_ssa_def *color = nir_bcsel(b, cond, back, front);
+      /* gl_FrontFace is a boolean but the intrinsic constructor creates
+       * 32-bit value by default.
+       */
+      nir_ssa_def *face = nir_load_front_face(b, 1);
+      nir_ssa_def *front, *back;
+      if (intr->intrinsic == nir_intrinsic_load_deref) {
+         front = nir_load_var(b, state->colors[idx].front);
+         back  = nir_load_var(b, state->colors[idx].back);
+      } else {
+         front = load_input(b, state->colors[idx].front);
+         back  = load_input(b, state->colors[idx].back);
+      }
+      nir_ssa_def *color = nir_bcsel(b, face, front, back);
 
       assert(intr->dest.is_ssa);
       nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_src_for_ssa(color));
@@ -200,7 +201,7 @@ nir_lower_two_sided_color(nir_shader *shader)
       .shader = shader,
    };
 
-   if (shader->stage != MESA_SHADER_FRAGMENT)
+   if (shader->info.stage != MESA_SHADER_FRAGMENT)
       return;
 
    if (setup_inputs(&state) != 0)