Mesa (master): glsl: track which program inputs are doubles

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 023fc344daae3e38f5e250cd0ea36ea674cd84f9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=023fc344daae3e38f5e250cd0ea36ea674cd84f9

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Apr  8 14:38:19 2015 +1000

glsl: track which program inputs are doubles

instead of doing the attempts at dual slot handling here,
let the backend do it.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/glsl/ir_set_program_inouts.cpp |   16 +++-------------
 src/mesa/main/mtypes.h             |    1 +
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/glsl/ir_set_program_inouts.cpp
index e877a20..b968a1e 100644
--- a/src/glsl/ir_set_program_inouts.cpp
+++ b/src/glsl/ir_set_program_inouts.cpp
@@ -105,13 +105,10 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len,
       int idx = var->data.location + var->data.index + offset + i;
       GLbitfield64 bitfield = BITFIELD64_BIT(idx);
 
-      /* dvec3 and dvec4 take up 2 slots */
-      if (dual_slot) {
-         idx += i;
-         bitfield |= bitfield << 1;
-      }
       if (var->data.mode == ir_var_shader_in) {
-	 prog->InputsRead |= bitfield;
+         prog->InputsRead |= bitfield;
+         if (dual_slot)
+            prog->DoubleInputsRead |= bitfield;
          if (is_fragment_shader) {
             gl_fragment_program *fprog = (gl_fragment_program *) prog;
             fprog->InterpQualifier[idx] =
@@ -120,13 +117,6 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len,
                fprog->IsCentroid |= bitfield;
             if (var->data.sample)
                fprog->IsSample |= bitfield;
-
-            /* Set the InterpQualifier of the next slot to the same as the
-             * current one, since dvec3 and dvec4 spans 2 slots.
-             */
-            if (dual_slot)
-               fprog->InterpQualifier[idx + 1] =
-                  (glsl_interp_qualifier) var->data.interpolation;
          }
       } else if (var->data.mode == ir_var_system_value) {
          prog->SystemValuesRead |= bitfield;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 1c5bb16..ad772e5 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2090,6 +2090,7 @@ struct gl_program
    struct nir_shader *nir;
 
    GLbitfield64 InputsRead;     /**< Bitmask of which input regs are read */
+   GLbitfield64 DoubleInputsRead;     /**< Bitmask of which input regs are read  and are doubles */
    GLbitfield64 OutputsWritten; /**< Bitmask of which output regs are written */
    GLbitfield SystemValuesRead;   /**< Bitmask of SYSTEM_VALUE_x inputs used */
    GLbitfield InputFlags[MAX_PROGRAM_INPUTS];   /**< PROG_PARAM_BIT_x flags */