Module: Mesa Branch: master Commit: 4ddbc0a07155335293f0d48823e1faae8665c799 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ddbc0a07155335293f0d48823e1faae8665c799
Author: Kenneth Graunke <[email protected]> Date: Tue Aug 22 15:18:32 2017 -0700 i965: Drop useless gen6_brw_upload_ff_gs_prog() wrapper. gen6...brw? Drop some baklava layers. Reviewed-by: Jordan Justen <[email protected]> --- src/mesa/drivers/dri/i965/brw_ff_gs.c | 5 ----- src/mesa/drivers/dri/i965/brw_ff_gs.h | 1 - src/mesa/drivers/dri/i965/brw_gs.c | 2 +- 3 files changed, 1 insertion(+), 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 f7f86d3387..f535537d75 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 bac2730b7e..b32b20d89b 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 9242504bb3..a0afe67a9a 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; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
