i965: Rearrange VS cache key struct.

No functional change.  This patch rearranges the struct
brw_vs_prog_key so that the two fields related to clipping are
together, and documents those fields.  This should make the patches
that follow easier to comprehend, since they add additional
clipping-related fields to this structure.

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

diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h
index 4b3103ff1b63478f2ac6ba873961489f0f70615e..7ec4ad8e793e4988f8c97c7f8b5a9e1f13fcd4b0 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vs.h
+++ b/src/mesa/drivers/dri/i965/brw_vs.h
@@ -45,11 +45,21 @@ struct brw_vs_prog_key {
     * Number of channels of the vertex attribute that need GL_FIXED rescaling
     */
    uint8_t gl_fixed_input_size[VERT_ATTRIB_MAX];
+
+   /**
+    * Number of user clip planes (or clip distances) that are active.
+    */
    GLuint nr_userclip:4;
+
+   /**
+    * True if the shader uses gl_ClipDistance, regardless of whether any clip
+    * flags are enabled.
+    */
+   GLuint uses_clip_distance:1;
+
    GLuint copy_edgeflag:1;
    GLuint point_coord_replace:8;
    GLuint clamp_vertex_color:1;
-   GLuint uses_clip_distance:1;
 };