i965: Remove unused userclip flags.

brw_vs_prog_data::userclip hasn't been used since commit f0cecd4
(i965: Move VUE map computation to once at VS compile time).

brw_gs_prog_key::userclip_active hasn't been used since commit 9f3d321
(i965: Make the userclip flag for the VUE map come from VS prog data).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 509560295904f54444b4f282a63758657e1c8cb7..c173e49fefd8f11df98454a12876da28b09302ca 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -448,7 +448,6 @@ struct brw_vs_prog_data {
    GLuint urb_entry_size;
 
    bool uses_vertexid;
-   bool userclip;
 
    int num_surfaces;
 

diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index 7663c6092f5e9693ad5e8f9730141797eefdf95b..c6c6c140bdd20d7a87534f3ad2fb9ba7fdf501ee 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -181,9 +181,6 @@ static void populate_key( struct brw_context *brw,
       key->pv_first = true;
    }
 
-   /* CACHE_NEW_VS_PROG (part of VUE map)*/
-   key->userclip_active = brw->vs.prog_data->userclip;
-
    if (intel->gen >= 7) {
       /* On Gen7 and later, we don't use GS (yet). */
       key->need_gs_prog = false;

diff --git a/src/mesa/drivers/dri/i965/brw_gs.h b/src/mesa/drivers/dri/i965/brw_gs.h
index f2597c8abab3c99746141bbbf470840051fbd1e1..6e014fa65d7ada81ab794a9b19fd0e605290bfbb 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_gs.h
+++ b/src/mesa/drivers/dri/i965/brw_gs.h
@@ -49,7 +49,6 @@ struct brw_gs_prog_key {
 
    GLuint pv_first:1;
    GLuint need_gs_prog:1;
-   GLuint userclip_active:1;
    GLuint rasterizer_discard:1;
 
    /**