Mesa (master): glsl: make variables private

[Timothy Arceri]

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

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Tue Sep  1 15:52:10 2015 +1000

glsl: make variables private

Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

---

 src/glsl/link_uniforms.cpp |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 879c488..238546b 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -808,6 +808,17 @@ private:
    unsigned next_image;
    unsigned next_subroutine;
 
+   /**
+    * Field counter is used to take care that uniform structures
+    * with explicit locations get sequential locations.
+    */
+   unsigned field_counter;
+
+   /**
+    * Current variable being processed.
+    */
+   ir_variable *current_var;
+
    /* Used to store the explicit location from current_var so that we can
     * reuse the location field for storing the uniform slot id.
     */
@@ -827,17 +838,6 @@ public:
    gl_texture_index targets[MAX_SAMPLERS];
 
    /**
-    * Current variable being processed.
-    */
-   ir_variable *current_var;
-
-   /**
-    * Field counter is used to take care that uniform structures
-    * with explicit locations get sequential locations.
-    */
-   unsigned field_counter;
-
-   /**
     * Mask of samplers used by the current shader stage.
     */
    unsigned shader_samplers_used;