diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-09-08 23:48:53 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-10-05 19:21:35 -0700 |
| commit | a85a8ecd32202b22e560bdf714b5715a168cc76e (patch) | |
| tree | 277808d431d729aa20efeaa64dfd7ec7c71b5588 /src/mesa/drivers/dri/i965/gen7_cs_state.c | |
| parent | 16d5536e55aed2aad0596e9385f1962b4ca5db2b (diff) | |
| download | external_mesa3d-a85a8ecd32202b22e560bdf714b5715a168cc76e.zip external_mesa3d-a85a8ecd32202b22e560bdf714b5715a168cc76e.tar.gz external_mesa3d-a85a8ecd32202b22e560bdf714b5715a168cc76e.tar.bz2 | |
i965: Eliminate brw->cs.prog_data pointer.
Just say no to:
- brw->cs.base.prog_data = &brw->cs.prog_data->base.base;
We'll just use the brw_stage_prog_data pointer in brw_stage_state
and downcast it to brw_cs_prog_data as needed.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Timothy Arceri <timothy.arcero@collabora.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_cs_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_cs_state.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c b/src/mesa/drivers/dri/i965/gen7_cs_state.c index 95b1d57..f0743fc 100644 --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c @@ -37,15 +37,15 @@ static void brw_upload_cs_state(struct brw_context *brw) { - if (!brw->cs.prog_data) + if (!brw->cs.base.prog_data) return; uint32_t offset; uint32_t *desc = (uint32_t*) brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, 8 * 4, 64, &offset); struct brw_stage_state *stage_state = &brw->cs.base; - struct brw_cs_prog_data *cs_prog_data = brw->cs.prog_data; - struct brw_stage_prog_data *prog_data = &cs_prog_data->base; + struct brw_stage_prog_data *prog_data = stage_state->prog_data; + struct brw_cs_prog_data *cs_prog_data = brw_cs_prog_data(prog_data); const struct gen_device_info *devinfo = &brw->screen->devinfo; if (INTEL_DEBUG & DEBUG_SHADER_TIME) { @@ -285,7 +285,8 @@ gen7_upload_cs_push_constants(struct brw_context *brw) if (cp) { /* BRW_NEW_CS_PROG_DATA */ - struct brw_cs_prog_data *cs_prog_data = brw->cs.prog_data; + struct brw_cs_prog_data *cs_prog_data = + brw_cs_prog_data(brw->cs.base.prog_data); _mesa_shader_write_subroutine_indices(&brw->ctx, MESA_SHADER_COMPUTE); brw_upload_cs_push_constants(brw, &cp->program.Base, cs_prog_data, @@ -319,7 +320,7 @@ brw_upload_cs_pull_constants(struct brw_context *brw) (struct brw_compute_program *) brw->compute_program; /* BRW_NEW_CS_PROG_DATA */ - const struct brw_stage_prog_data *prog_data = &brw->cs.prog_data->base; + const struct brw_stage_prog_data *prog_data = brw->cs.base.prog_data; _mesa_shader_write_subroutine_indices(&brw->ctx, MESA_SHADER_COMPUTE); /* _NEW_PROGRAM_CONSTANTS */ |