trace: Use u_time.

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

diff --git a/src/gallium/drivers/i965/brw_vs.c b/src/gallium/drivers/i965/brw_vs.c
index 25b51eb41e3e170b017b7c97ebcec5cc459623f3..ca8ee79550d3ea7efa9dfefb8f6ea337cb207ae1 100644 (file)
--- a/src/gallium/drivers/i965/brw_vs.c
+++ b/src/gallium/drivers/i965/brw_vs.c
@@ -33,9 +33,7 @@
 
 #include "brw_context.h"
 #include "brw_vs.h"
-#include "brw_util.h"
 #include "brw_state.h"
-#include "brw_pipe_rast.h"
 
 
 
@@ -58,18 +56,6 @@ static enum pipe_error do_vs_prog( struct brw_context *brw,
    c.prog_data.nr_outputs = vp->info.num_outputs;
    c.prog_data.nr_inputs = vp->info.num_inputs;
 
-   /* XXX: we want edgeflag handling to be integrated to the vertex
-    * shader, but are currently faking the edgeflag output:
-    */
-   if (c.key.copy_edgeflag) {
-      c.prog_data.output_edgeflag = c.prog_data.nr_outputs;
-      c.prog_data.nr_outputs++;
-   }
-   else {
-      c.prog_data.output_edgeflag = ~0;
-   }
-
-
    if (1)
       tgsi_dump(c.vp->tokens, 0);
 
@@ -84,7 +70,7 @@ static enum pipe_error do_vs_prog( struct brw_context *brw,
       return ret;
 
    ret = brw_upload_cache( &brw->cache, BRW_VS_PROG,
-                           &c.key, sizeof(c.key),
+                           &c.key, brw_vs_prog_key_size(&c.key),
                            NULL, 0,
                            program, program_size,
                            &c.prog_data,
@@ -108,8 +94,6 @@ static enum pipe_error brw_upload_vs_prog(struct brw_context *brw)
 
    key.program_string_id = vp->id;
    key.nr_userclip = brw->curr.ucp.nr;
-   key.copy_edgeflag = (brw->curr.rast->templ.fill_ccw != PIPE_POLYGON_MODE_FILL ||
-                       brw->curr.rast->templ.fill_cw != PIPE_POLYGON_MODE_FILL);
 
    memcpy(&key.fs_signature, sig, brw_fs_signature_size(sig));