i965: clip: Remove no-longer-needed variables.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_clip.h

diff --git a/src/mesa/drivers/dri/i965/brw_clip.h b/src/mesa/drivers/dri/i965/brw_clip.h
index d71bac7f617512fceb6bdc37a55aea96ae55f9e9..97372849ef35eb68ee4347257560731402c9351d 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_clip.h
+++ b/src/mesa/drivers/dri/i965/brw_clip.h
@@ -55,7 +55,8 @@ struct brw_clip_prog_key {
    GLuint copy_bfc_cw:1;
    GLuint copy_bfc_ccw:1;
    GLuint clip_mode:3;
-   GLuint pad0:11;
+   GLuint do_twoside_color:1;
+   GLuint pad0:10;
 
    GLfloat offset_factor;
    GLfloat offset_units;
@@ -103,25 +104,28 @@ struct brw_clip_compile {
       struct brw_reg ff_sync;
    } reg;
 
-   /* 3 different ways of expressing vertex size:
-    */
-   GLuint nr_attrs;
+   /* Number of registers storing VUE data */
    GLuint nr_regs;
-   GLuint nr_bytes;
 
    GLuint first_tmp;
    GLuint last_tmp;
 
    GLboolean need_direction;
 
-   GLuint last_mrf;
-
-   GLuint header_position_offset;
-   GLuint offset[VERT_ATTRIB_MAX];
+   struct brw_vue_map vue_map;
 };
 
 #define ATTR_SIZE  (4*4)
 
+/**
+ * True if the given vert_result is one of the outputs of the vertex shader.
+ */
+static inline bool brw_clip_have_vert_result(struct brw_clip_compile *c,
+                                             GLuint vert_result)
+{
+   return (c->key.attrs & BITFIELD64_BIT(vert_result)) ? 1 : 0;
+}
+
 /* Points are only culled, so no need for a clip routine, however it
  * works out easier to have a dummy one.
  */