intel: Add a batch flush between front-buffer downsample and X protocol.

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

diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h
index 75c8a5f8c98b68cdd150b96d4b05980b883922ae..90c96b607ce823af68a1df548ae85b90395c4285 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vs.h
+++ b/src/mesa/drivers/dri/i965/brw_vs.h
@@ -36,7 +36,7 @@
 
 #include "brw_context.h"
 #include "brw_eu.h"
-#include "brw_program.h"
+#include "brw_vec4.h"
 #include "program/program.h"
 
 /**
@@ -51,60 +51,42 @@
 #define BRW_ATTRIB_WA_SCALE         64  /* interpret as scaled in shader */
 
 struct brw_vs_prog_key {
-   GLuint program_string_id;
+   struct brw_vec4_prog_key base;
 
    /*
     * Per-attribute workaround flags
     */
    uint8_t gl_attrib_wa_flags[VERT_ATTRIB_MAX];
 
-   /**
-    * True if at least one clip flag is enabled, regardless of whether the
-    * shader uses clip planes or gl_ClipDistance.
-    */
-   GLuint userclip_active:1;
-
-   /**
-    * How many user clipping planes are being uploaded to the vertex shader as
-    * push constants.
-    */
-   GLuint nr_userclip_plane_consts: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;
 
    /**
-    * For pre-Gen6 hardware, a bitfield indicating which clipping planes are
-    * enabled.  This is used to compact clip planes.
-    *
-    * For Gen6 and later hardware, clip planes are not compacted, so this
-    * value is zero to avoid provoking unnecessary shader recompiles.
+    * For pre-Gen6 hardware, a bitfield indicating which texture coordinates
+    * are going to be replaced with point coordinates (as a consequence of a
+    * call to glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE)).  Because
+    * our SF thread requires exact matching between VS outputs and FS inputs,
+    * these texture coordinates will need to be unconditionally included in
+    * the VUE, even if they aren't written by the vertex shader.
     */
-   GLuint userclip_planes_enabled_gen_4_5:MAX_CLIP_PLANES;
-
-   GLuint copy_edgeflag:1;
    GLuint point_coord_replace:8;
-   GLuint clamp_vertex_color:1;
-
-   struct brw_sampler_prog_key_data tex;
 };
 
 
 struct brw_vs_compile {
+   struct brw_vec4_compile base;
    struct brw_vs_prog_key key;
-   struct brw_vs_prog_data prog_data;
 
    struct brw_vertex_program *vp;
-
-   GLuint last_scratch; /**< measured in 32-byte (register size) units */
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 const unsigned *brw_vs_emit(struct brw_context *brw,
                             struct gl_shader_program *prog,
                             struct brw_vs_compile *c,
+                            struct brw_vs_prog_data *prog_data,
                             void *mem_ctx,
                             unsigned *program_size);
 bool brw_vs_precompile(struct gl_context *ctx, struct gl_shader_program *prog);
@@ -115,4 +97,8 @@ bool brw_vs_prog_data_compare(const void *a, const void *b,
                               int aux_size, const void *key);
 void brw_vs_prog_data_free(const void *in_prog_data);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif