Mesa (master): glsl: Create a field to store fractional varying locations.

[Paul Berry]

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

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Wed Dec  5 10:47:55 2012 -0800

glsl: Create a field to store fractional varying locations.

Currently, the location of each varying is recorded in ir_variable as
a multiple of the size of a vec4.  In order to pack varyings, we need
to be able to record, e.g. that a vec2 is stored in the second half of
a varying slot rather than the first half.

This patch introduces a field ir_variable::location_frac, which
represents the offset within a vec4 where a varying's value is stored.
Varyings that are not subject to packing will always have a
location_frac value of zero.

Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/ir.cpp     |    1 +
 src/glsl/ir.h       |    9 +++++++++
 src/glsl/linker.cpp |    6 ++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 7b0a487..703f5ec 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -1492,6 +1492,7 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name,
    this->explicit_location = false;
    this->has_initializer = false;
    this->location = -1;
+   this->location_frac = 0;
    this->uniform_block = -1;
    this->warn_extension = NULL;
    this->constant_value = NULL;
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index e2ecb3d..85fc5ce 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -446,6 +446,15 @@ public:
    unsigned is_unmatched_generic_inout:1;
 
    /**
+    * If non-zero, then this variable may be packed along with other variables
+    * into a single varying slot, so this offset should be applied when
+    * accessing components.  For example, an offset of 1 means that the x
+    * component of this variable is actually stored in component y of the
+    * location specified by \c location.
+    */
+   unsigned location_frac:2;
+
+   /**
     * \brief Layout qualifier for gl_FragDepth.
     *
     * This is not equal to \c ir_depth_layout_none if and only if this
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index ee6dc25..b13a6aa 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -226,10 +226,12 @@ link_invalidate_variable_locations(gl_shader *sh, int input_base,
       if ((var->location >= base) && !var->explicit_location)
          var->location = -1;
 
-      if ((var->location == -1) && !var->explicit_location)
+      if ((var->location == -1) && !var->explicit_location) {
          var->is_unmatched_generic_inout = 1;
-      else
+         var->location_frac = 0;
+      } else {
          var->is_unmatched_generic_inout = 0;
+      }
    }
 }