diff options
| author | Kenneth Graunke <[email protected]> | 2016-09-08 23:48:53 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-10-05 19:21:06 -0700 |
| commit | 40258a13d5bf81303585eaf1859fcb85e373be3e (patch) | |
| tree | 632f72013e4d467afeb56e55e3f5305b4047e387 /src/mesa/drivers/dri/i965/brw_state_upload.c | |
| parent | e51e055fcdf8107aafaba358fa65b00f963e1728 (diff) | |
i965: Eliminate brw->vs.prog_data pointer.
Just say no to:
- brw->vs.base.prog_data = &brw->vs.prog_data->base.base;
We'll just use the brw_stage_prog_data pointer in brw_stage_state
and downcast it to brw_vs_prog_data as needed.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_state_upload.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 055fed128a0..6ace37bdc01 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -713,12 +713,15 @@ brw_upload_programs(struct brw_context *brw, */ GLbitfield64 old_slots = brw->vue_map_geom_out.slots_valid; bool old_separate = brw->vue_map_geom_out.separate; + struct brw_vue_prog_data *vue_prog_data; if (brw->geometry_program) - brw->vue_map_geom_out = brw->gs.prog_data->base.vue_map; + vue_prog_data = brw_vue_prog_data(brw->gs.base.prog_data); else if (brw->tess_eval_program) - brw->vue_map_geom_out = brw->tes.prog_data->base.vue_map; + vue_prog_data = brw_vue_prog_data(brw->tes.base.prog_data); else - brw->vue_map_geom_out = brw->vs.prog_data->base.vue_map; + vue_prog_data = brw_vue_prog_data(brw->vs.base.prog_data); + + brw->vue_map_geom_out = vue_prog_data->vue_map; /* If the layout has changed, signal BRW_NEW_VUE_MAP_GEOM_OUT. */ if (old_slots != brw->vue_map_geom_out.slots_valid || |