diff options
| -rw-r--r-- | src/intel/blorp/blorp_genX_exec.h | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen4_blorp_exec.h | 14 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_blorp_exec.c | 6 |
3 files changed, 15 insertions, 17 deletions
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h index cc408ca71cb..6dd92d236af 100644 --- a/src/intel/blorp/blorp_genX_exec.h +++ b/src/intel/blorp/blorp_genX_exec.h @@ -529,8 +529,7 @@ blorp_emit_vertex_elements(struct blorp_batch *batch, /* 3DSTATE_VIEWPORT_STATE_POINTERS */ static uint32_t -blorp_emit_cc_viewport(struct blorp_batch *batch, - const struct blorp_params *params) +blorp_emit_cc_viewport(struct blorp_batch *batch) { uint32_t cc_vp_offset; blorp_emit_dynamic(batch, GENX(CC_VIEWPORT), vp, 32, &cc_vp_offset) { @@ -553,8 +552,7 @@ blorp_emit_cc_viewport(struct blorp_batch *batch, } static uint32_t -blorp_emit_sampler_state(struct blorp_batch *batch, - const struct blorp_params *params) +blorp_emit_sampler_state(struct blorp_batch *batch) { uint32_t offset; blorp_emit_dynamic(batch, GENX(SAMPLER_STATE), sampler, 32, &offset) { @@ -1013,7 +1011,7 @@ blorp_emit_blend_state(struct blorp_batch *batch, static uint32_t blorp_emit_color_calc_state(struct blorp_batch *batch, - const struct blorp_params *params) + MAYBE_UNUSED const struct blorp_params *params) { uint32_t offset; blorp_emit_dynamic(batch, GENX(COLOR_CALC_STATE), cc, 64, &offset) { @@ -1204,7 +1202,7 @@ blorp_emit_pipeline(struct blorp_batch *batch, blorp_emit(batch, GENX(3DSTATE_CONSTANT_PS), ps); if (params->src.enabled) - blorp_emit_sampler_state(batch, params); + blorp_emit_sampler_state(batch); blorp_emit_3dstate_multisample(batch, params); @@ -1238,7 +1236,7 @@ blorp_emit_pipeline(struct blorp_batch *batch, blorp_emit_sf_config(batch, params); blorp_emit_ps_config(batch, params); - blorp_emit_cc_viewport(batch, params); + blorp_emit_cc_viewport(batch); } /******** This is the end of the pipeline setup code ********/ diff --git a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h index 7e5199c56eb..e59bc9f2c2c 100644 --- a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h +++ b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h @@ -46,8 +46,7 @@ instruction_state_address(struct blorp_batch *batch, uint32_t offset) } static struct blorp_address -blorp_emit_vs_state(struct blorp_batch *batch, - const struct blorp_params *params) +blorp_emit_vs_state(struct blorp_batch *batch) { assert(batch->blorp->driver_ctx == batch->driver_batch); struct brw_context *brw = batch->driver_batch; @@ -116,7 +115,7 @@ blorp_emit_wm_state(struct blorp_batch *batch, /* Iron Lake can't do sampler prefetch */ wm.SamplerCount = (GEN_GEN != 5); wm.BindingTableEntryCount = 2; - uint32_t sampler = blorp_emit_sampler_state(batch, params); + uint32_t sampler = blorp_emit_sampler_state(batch); wm.SamplerStatePointer = dynamic_state_address(batch, sampler); } @@ -155,10 +154,9 @@ blorp_emit_wm_state(struct blorp_batch *batch, } static struct blorp_address -blorp_emit_color_calc_state(struct blorp_batch *batch, - const struct blorp_params *params) +blorp_emit_color_calc_state(struct blorp_batch *batch) { - uint32_t cc_viewport = blorp_emit_cc_viewport(batch, params); + uint32_t cc_viewport = blorp_emit_cc_viewport(batch); uint32_t offset; blorp_emit_dynamic(batch, GENX(COLOR_CALC_STATE), cc, 64, &offset) { @@ -178,12 +176,12 @@ blorp_emit_pipeline(struct blorp_batch *batch, emit_urb_config(batch, params); blorp_emit(batch, GENX(3DSTATE_PIPELINED_POINTERS), pp) { - pp.PointertoVSState = blorp_emit_vs_state(batch, params); + pp.PointertoVSState = blorp_emit_vs_state(batch); pp.GSEnable = false; pp.ClipEnable = false; pp.PointertoSFState = blorp_emit_sf_state(batch, params); pp.PointertoWMState = blorp_emit_wm_state(batch, params); - pp.PointertoColorCalcState = blorp_emit_color_calc_state(batch, params); + pp.PointertoColorCalcState = blorp_emit_color_calc_state(batch); } brw_upload_urb_fence(brw); diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c index 2bdd93e9bdd..53069e6fe23 100644 --- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c +++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c @@ -203,7 +203,8 @@ blorp_get_workaround_page(struct blorp_batch *batch) #endif static void -blorp_flush_range(struct blorp_batch *batch, void *start, size_t size) +blorp_flush_range(UNUSED struct blorp_batch *batch, UNUSED void *start, + UNUSED size_t size) { /* All allocated states come from the batch which we will flush before we * submit it. There's nothing for us to do here. @@ -212,7 +213,8 @@ blorp_flush_range(struct blorp_batch *batch, void *start, size_t size) static void blorp_emit_urb_config(struct blorp_batch *batch, - unsigned vs_entry_size, unsigned sf_entry_size) + unsigned vs_entry_size, + MAYBE_UNUSED unsigned sf_entry_size) { assert(batch->blorp->driver_ctx == batch->driver_batch); struct brw_context *brw = batch->driver_batch; |