From 25ce6c6943576e22d8d00049578d0e6cc5feea07 Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Fri, 30 Jan 2015 11:37:54 +0200 Subject: [PATCH] i965/blorp: Remove unused arguments Reviewed-by: Kenneth Graunke Signed-off-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/brw_blorp.h | 7 ++----- src/mesa/drivers/dri/i965/gen6_blorp.cpp | 20 +++++++------------- src/mesa/drivers/dri/i965/gen7_blorp.cpp | 6 +++--- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h index 6aaae6537b5..f277deec7ae 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.h +++ b/src/mesa/drivers/dri/i965/brw_blorp.h @@ -380,8 +380,7 @@ gen6_blorp_emit_blend_state(struct brw_context *brw, const brw_blorp_params *params); uint32_t -gen6_blorp_emit_cc_state(struct brw_context *brw, - const brw_blorp_params *params); +gen6_blorp_emit_cc_state(struct brw_context *brw); uint32_t gen6_blorp_emit_wm_constants(struct brw_context *brw, @@ -393,7 +392,6 @@ gen6_blorp_emit_vs_disable(struct brw_context *brw, uint32_t gen6_blorp_emit_binding_table(struct brw_context *brw, - const brw_blorp_params *params, uint32_t wm_surf_offset_renderbuffer, uint32_t wm_surf_offset_texture); @@ -406,8 +404,7 @@ gen6_blorp_emit_gs_disable(struct brw_context *brw, const brw_blorp_params *params); void -gen6_blorp_emit_clip_disable(struct brw_context *brw, - const brw_blorp_params *params); +gen6_blorp_emit_clip_disable(struct brw_context *brw); void gen6_blorp_emit_drawing_rectangle(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp index 14e073b237f..2fe2840f4f4 100644 --- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp @@ -268,8 +268,7 @@ gen6_blorp_emit_blend_state(struct brw_context *brw, /* CC_STATE */ uint32_t -gen6_blorp_emit_cc_state(struct brw_context *brw, - const brw_blorp_params *params) +gen6_blorp_emit_cc_state(struct brw_context *brw) { uint32_t cc_state_offset; @@ -431,7 +430,6 @@ gen6_blorp_emit_surface_state(struct brw_context *brw, /* BINDING_TABLE. See brw_wm_binding_table(). */ uint32_t gen6_blorp_emit_binding_table(struct brw_context *brw, - const brw_blorp_params *params, uint32_t wm_surf_offset_renderbuffer, uint32_t wm_surf_offset_texture) { @@ -502,7 +500,6 @@ gen6_blorp_emit_sampler_state(struct brw_context *brw, */ static void gen6_blorp_emit_sampler_state_pointers(struct brw_context *brw, - const brw_blorp_params *params, uint32_t sampler_offset) { BEGIN_BATCH(4); @@ -602,8 +599,7 @@ gen6_blorp_emit_gs_disable(struct brw_context *brw, * output, but does spare a few electrons. */ void -gen6_blorp_emit_clip_disable(struct brw_context *brw, - const brw_blorp_params *params) +gen6_blorp_emit_clip_disable(struct brw_context *brw) { BEGIN_BATCH(4); OUT_BATCH(_3DSTATE_CLIP << 16 | (4 - 2)); @@ -767,7 +763,6 @@ gen6_blorp_emit_constant_ps_disable(struct brw_context *brw, */ static void gen6_blorp_emit_binding_table_pointers(struct brw_context *brw, - const brw_blorp_params *params, uint32_t wm_bind_bo_offset) { BEGIN_BATCH(4); @@ -1036,7 +1031,7 @@ gen6_blorp_exec(struct brw_context *brw, gen6_blorp_emit_urb_config(brw, params); if (params->use_wm_prog) { cc_blend_state_offset = gen6_blorp_emit_blend_state(brw, params); - cc_state_offset = gen6_blorp_emit_cc_state(brw, params); + cc_state_offset = gen6_blorp_emit_cc_state(brw); } depthstencil_offset = gen6_blorp_emit_depth_stencil_state(brw, params); gen6_blorp_emit_cc_state_pointers(brw, params, cc_blend_state_offset, @@ -1057,17 +1052,16 @@ gen6_blorp_exec(struct brw_context *brw, I915_GEM_DOMAIN_SAMPLER, 0); } wm_bind_bo_offset = - gen6_blorp_emit_binding_table(brw, params, + gen6_blorp_emit_binding_table(brw, wm_surf_offset_renderbuffer, wm_surf_offset_texture); sampler_offset = gen6_blorp_emit_sampler_state(brw, BRW_MAPFILTER_LINEAR, 0, true); - - gen6_blorp_emit_sampler_state_pointers(brw, params, sampler_offset); + gen6_blorp_emit_sampler_state_pointers(brw, sampler_offset); } gen6_blorp_emit_vs_disable(brw, params); gen6_blorp_emit_gs_disable(brw, params); - gen6_blorp_emit_clip_disable(brw, params); + gen6_blorp_emit_clip_disable(brw); gen6_blorp_emit_sf_config(brw, params); if (params->use_wm_prog) gen6_blorp_emit_constant_ps(brw, params, wm_push_const_offset); @@ -1075,7 +1069,7 @@ gen6_blorp_exec(struct brw_context *brw, gen6_blorp_emit_constant_ps_disable(brw, params); gen6_blorp_emit_wm_config(brw, params, prog_offset, prog_data); if (params->use_wm_prog) - gen6_blorp_emit_binding_table_pointers(brw, params, wm_bind_bo_offset); + gen6_blorp_emit_binding_table_pointers(brw, wm_bind_bo_offset); gen6_blorp_emit_viewport_state(brw, params); if (params->depth.mt) diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp index c9e7cb7f049..12f515d3c83 100644 --- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp @@ -786,7 +786,7 @@ gen7_blorp_exec(struct brw_context *brw, gen7_blorp_emit_urb_config(brw); if (params->use_wm_prog) { cc_blend_state_offset = gen6_blorp_emit_blend_state(brw, params); - cc_state_offset = gen6_blorp_emit_cc_state(brw, params); + cc_state_offset = gen6_blorp_emit_cc_state(brw); gen7_blorp_emit_blend_state_pointer(brw, cc_blend_state_offset); gen7_blorp_emit_cc_state_pointer(brw, cc_state_offset); } @@ -809,7 +809,7 @@ gen7_blorp_exec(struct brw_context *brw, false /* is_render_target */); } wm_bind_bo_offset = - gen6_blorp_emit_binding_table(brw, params, + gen6_blorp_emit_binding_table(brw, wm_surf_offset_renderbuffer, wm_surf_offset_texture); sampler_offset = @@ -821,7 +821,7 @@ gen7_blorp_exec(struct brw_context *brw, gen7_blorp_emit_ds_disable(brw); gen7_blorp_emit_gs_disable(brw); gen7_blorp_emit_streamout_disable(brw); - gen6_blorp_emit_clip_disable(brw, params); + gen6_blorp_emit_clip_disable(brw); gen7_blorp_emit_sf_config(brw, params); gen7_blorp_emit_wm_config(brw, params, prog_data); if (params->use_wm_prog) { -- 2.30.2