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 | 16d5536e55aed2aad0596e9385f1962b4ca5db2b (patch) | |
tree | 490dbaf922b64a7b10188e30579c5cfe7bc3fd96 /src/mesa/drivers/dri/i965/gen7_sf_state.c | |
parent | ff366f3db4a117244c6076e5babd440c912200f9 (diff) | |
download | external_mesa3d-16d5536e55aed2aad0596e9385f1962b4ca5db2b.zip external_mesa3d-16d5536e55aed2aad0596e9385f1962b4ca5db2b.tar.gz external_mesa3d-16d5536e55aed2aad0596e9385f1962b4ca5db2b.tar.bz2 |
i965: Eliminate brw->wm.prog_data pointer.
Just say no to:
- brw->wm.base.prog_data = &brw->wm.prog_data->base.base;
We'll just use the brw_stage_prog_data pointer in brw_stage_state
and downcast it to brw_wm_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_sf_state.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sf_state.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c index 06d3463..f1b3169 100644 --- a/src/mesa/drivers/dri/i965/gen7_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c @@ -35,7 +35,9 @@ upload_sbe_state(struct brw_context *brw) { struct gl_context *ctx = &brw->ctx; /* BRW_NEW_FS_PROG_DATA */ - uint32_t num_outputs = brw->wm.prog_data->num_varying_inputs; + const struct brw_wm_prog_data *wm_prog_data = + brw_wm_prog_data(brw->wm.base.prog_data); + uint32_t num_outputs = wm_prog_data->num_varying_inputs; uint32_t dw1; uint32_t point_sprite_enables; int i; @@ -81,7 +83,7 @@ upload_sbe_state(struct brw_context *brw) } OUT_BATCH(point_sprite_enables); /* dw10 */ - OUT_BATCH(brw->wm.prog_data->flat_inputs); + OUT_BATCH(wm_prog_data->flat_inputs); OUT_BATCH(0); /* wrapshortest enables 0-7 */ OUT_BATCH(0); /* wrapshortest enables 8-15 */ ADVANCE_BATCH(); |