[Mesa-dev] [PATCH 08/13] i965/cs: Remove the prog argument from local_id_payload_dwords

[Jason Ekstrand]

---
 src/mesa/drivers/dri/i965/brw_cs.h        | 3 +--
 src/mesa/drivers/dri/i965/brw_fs.cpp      | 2 +-
 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 0018c04..0c0ed2b 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 a4865b2..699d3d0 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 0b88b2c..5edc4fc 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
-- 
2.5.0.400.gff86faf