Mesa (master): mesa: reorder gl_transform_feedback_object

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Mar 20 16:52:44 2015 +1000

mesa: reorder gl_transform_feedback_object

Reduces size from 184 to 176 bytes.

Acked-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Alex Deucher alexander.deucher at amd.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/main/mtypes.h |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 72db275..1b8341d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1883,8 +1883,8 @@ struct gl_transform_feedback_info
 struct gl_transform_feedback_object
 {
    GLuint Name;  /**< AKA the object ID */
-   GLchar *Label;     /**< GL_KHR_debug */
    GLint RefCount;
+   GLchar *Label;     /**< GL_KHR_debug */
    GLboolean Active;  /**< Is transform feedback enabled? */
    GLboolean Paused;  /**< Is transform feedback paused? */
    GLboolean EndedAnytime; /**< Has EndTransformFeedback been called
@@ -1892,14 +1892,6 @@ struct gl_transform_feedback_object
    GLboolean EverBound; /**< Has this object been bound? */
 
    /**
-    * The shader program active when BeginTransformFeedback() was called.
-    * When active and unpaused, this equals ctx->Shader.CurrentProgram[stage],
-    * where stage is the pipeline stage that is the source of data for
-    * transform feedback.
-    */
-   struct gl_shader_program *shader_program;
-
-   /**
     * GLES: if Active is true, remaining number of primitives which can be
     * rendered without overflow.  This is necessary to track because GLES
     * requires us to generate INVALID_OPERATION if a call to glDrawArrays or
@@ -1910,6 +1902,14 @@ struct gl_transform_feedback_object
     */
    unsigned GlesRemainingPrims;
 
+   /**
+    * The shader program active when BeginTransformFeedback() was called.
+    * When active and unpaused, this equals ctx->Shader.CurrentProgram[stage],
+    * where stage is the pipeline stage that is the source of data for
+    * transform feedback.
+    */
+   struct gl_shader_program *shader_program;
+
    /** The feedback buffers */
    GLuint BufferNames[MAX_FEEDBACK_BUFFERS];
    struct gl_buffer_object *Buffers[MAX_FEEDBACK_BUFFERS];