From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Tue, 1 Sep 2015 05:52:10 +0000 (+1000)
Subject: glsl: make variables private
X-Git-Tag: upstream/17.1.0~16050
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12af915e27e4f10bc4c29f1cc8119b28ba27d874;p=platform%2Fupstream%2Fmesa.git

glsl: make variables private

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

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;