summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2017-08-22 15:18:32 -0700
committerKenneth Graunke <[email protected]>2017-09-02 12:56:18 -0700
commit4ddbc0a07155335293f0d48823e1faae8665c799 (patch)
treeb73023c9237dc3942039c97a6a00b2b4ddd90fb4 /src/mesa
parentdc9e08b0c3b04ba77ed59b8700e9f43edccb3168 (diff)
i965: Drop useless gen6_brw_upload_ff_gs_prog() wrapper.
gen6...brw? Drop some baklava layers. Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_ff_gs.c5
-rw-r--r--src/mesa/drivers/dri/i965/brw_ff_gs.h1
-rw-r--r--src/mesa/drivers/dri/i965/brw_gs.c2
3 files changed, 1 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c
index f7f86d33874..f535537d75a 100644
--- a/src/mesa/drivers/dri/i965/brw_ff_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c
@@ -258,8 +258,3 @@ brw_upload_ff_gs_prog(struct brw_context *brw)
}
}
}
-
-void gen6_brw_upload_ff_gs_prog(struct brw_context *brw)
-{
- brw_upload_ff_gs_prog(brw);
-}
diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.h b/src/mesa/drivers/dri/i965/brw_ff_gs.h
index bac2730b7e4..b32b20d89bd 100644
--- a/src/mesa/drivers/dri/i965/brw_ff_gs.h
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs.h
@@ -110,7 +110,6 @@ void brw_ff_gs_lines(struct brw_ff_gs_compile *c);
void gen6_sol_program(struct brw_ff_gs_compile *c,
struct brw_ff_gs_prog_key *key,
unsigned num_verts, bool check_edge_flag);
-void gen6_brw_upload_ff_gs_prog(struct brw_context *brw);
void
brw_upload_ff_gs_prog(struct brw_context *brw);
diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index 9242504bb30..a0afe67a9aa 100644
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -211,7 +211,7 @@ brw_upload_gs_prog(struct brw_context *brw)
/* No geometry shader. Vertex data just passes straight through. */
if (devinfo->gen == 6 &&
(brw->ctx.NewDriverState & BRW_NEW_TRANSFORM_FEEDBACK)) {
- gen6_brw_upload_ff_gs_prog(brw);
+ brw_upload_ff_gs_prog(brw);
return;
}