AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965/cs: Remove the prog argument from local_id_payload_dwords

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2015-10-01 13:52:21 -07:00
parent 7926c3ea7d
commit 7b974c5f90
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_cs.h
+1 -2
View File
@@ -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
}
src/mesa/drivers/dri/i965/brw_fs.cpp
+1 -1
View File
@@ -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;
src/mesa/drivers/dri/i965/gen7_cs_state.c
+3 -4
View File
@@ -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