diff options
| author | Jason Ekstrand <[email protected]> | 2015-10-01 13:52:21 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-10-02 14:22:53 -0700 |
| commit | 7b974c5f902b3f652776471aa35306195247a8a7 (patch) | |
| tree | 6686d4a57028a83875a148b296fa0cd5dc756a36 /src/mesa/drivers/dri/i965 | |
| parent | 7926c3ea7d8f455cbee390d20c78dadf5432b9bc (diff) | |
i965/cs: Remove the prog argument from local_id_payload_dwords
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_cs.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_cs_state.c | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_cs.h b/src/mesa/drivers/dri/i965/brw_cs.h index 0018c043415..0c0ed2bc909 100644 --- a/src/mesa/drivers/dri/i965/brw_cs.h +++ b/src/mesa/drivers/dri/i965/brw_cs.h @@ -49,8 +49,7 @@ brw_cs_emit(struct brw_context *brw, unsigned *final_assembly_size); unsigned -brw_cs_prog_local_id_payload_dwords(const struct gl_program *prog, - unsigned dispatch_width); +brw_cs_prog_local_id_payload_dwords(unsigned dispatch_width); #ifdef __cplusplus } diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 60905c0bc92..1354a2668d5 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -4727,7 +4727,7 @@ fs_visitor::setup_cs_payload() if (prog->SystemValuesRead & SYSTEM_BIT_LOCAL_INVOCATION_ID) { const unsigned local_id_dwords = - brw_cs_prog_local_id_payload_dwords(prog, dispatch_width); + brw_cs_prog_local_id_payload_dwords(dispatch_width); assert((local_id_dwords & 0x7) == 0); const unsigned local_id_regs = local_id_dwords / 8; payload.local_invocation_id_reg = payload.num_regs; diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index 0b88b2c0e71..5edc4fc9842 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -72,7 +72,7 @@ brw_upload_cs_state(struct brw_context *brw) if (prog->SystemValuesRead & SYSTEM_BIT_LOCAL_INVOCATION_ID) { local_id_dwords = - brw_cs_prog_local_id_payload_dwords(prog, cs_prog_data->simd_size); + brw_cs_prog_local_id_payload_dwords(cs_prog_data->simd_size); } unsigned push_constant_data_size = @@ -216,8 +216,7 @@ const struct brw_tracked_state brw_cs_state = { * */ unsigned -brw_cs_prog_local_id_payload_dwords(const struct gl_program *prog, - unsigned dispatch_width) +brw_cs_prog_local_id_payload_dwords(unsigned dispatch_width) { return 3 * dispatch_width; } @@ -272,7 +271,7 @@ brw_upload_cs_push_constants(struct brw_context *brw, if (prog->SystemValuesRead & SYSTEM_BIT_LOCAL_INVOCATION_ID) { local_id_dwords = - brw_cs_prog_local_id_payload_dwords(prog, cs_prog_data->simd_size); + brw_cs_prog_local_id_payload_dwords(cs_prog_data->simd_size); } /* Updates the ParamaterValues[i] pointers for all parameters of the |