Merge commit 'origin/gallium-draw-retval'

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

diff --git a/src/gallium/drivers/i965/brw_vs.h b/src/gallium/drivers/i965/brw_vs.h
index 2a2dbb3457c65e40e3b860a983fea53da423f0bd..944d88c84cc8028157922539fc8d157a5c0c0857 100644 (file)
--- a/src/gallium/drivers/i965/brw_vs.h
+++ b/src/gallium/drivers/i965/brw_vs.h
@@ -41,10 +41,12 @@
 struct brw_vs_prog_key {
    GLuint program_string_id;
    GLuint nr_userclip:4;
-   GLuint copy_edgeflag:1;
    GLuint pad:26;
+   struct brw_fs_signature fs_signature;
 };
 
+#define brw_vs_prog_key_size(s) (offsetof(struct brw_vs_prog_key, fs_signature) + \
+                                 brw_fs_signature_size(&(s)->fs_signature))
 
 
 #define MAX_IF_DEPTH 32
@@ -60,10 +62,11 @@ struct brw_vs_compile {
 
    GLuint nr_inputs;
    GLuint nr_outputs;
-   GLboolean copy_edgeflag;
+   GLuint nr_immediates;
+   GLfloat immediate[128][4];
 
-   GLuint first_output;
-   GLuint first_overflow_output; /**< VERT_ATTRIB_x */
+   GLuint overflow_grf_start;
+   GLuint overflow_count;
 
    GLuint first_tmp;
    GLuint last_tmp;