diff options
| author | Eric Anholt <eric@anholt.net> | 2014-05-19 10:06:15 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-07-02 12:45:59 -0700 |
| commit | 34f4e614dd28983a3e5dd5a3b34721ca4d0a8162 (patch) | |
| tree | 41490d16f89f30984ade86c279e7af882a08641a /src/mesa/drivers/dri/i965/gen7_gs_state.c | |
| parent | c0f1929dd23bbc558e9eef0f8fd40e10dfef3c21 (diff) | |
| download | external_mesa3d-34f4e614dd28983a3e5dd5a3b34721ca4d0a8162.zip external_mesa3d-34f4e614dd28983a3e5dd5a3b34721ca4d0a8162.tar.gz external_mesa3d-34f4e614dd28983a3e5dd5a3b34721ca4d0a8162.tar.bz2 | |
i965/gen6+: Merge VS/GS and WM push constant buffer upload paths.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_gs_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_gs_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_gs_state.c b/src/mesa/drivers/dri/i965/gen7_gs_state.c index 5f66bc6..93f48f6 100644 --- a/src/mesa/drivers/dri/i965/gen7_gs_state.c +++ b/src/mesa/drivers/dri/i965/gen7_gs_state.c @@ -37,11 +37,11 @@ gen7_upload_gs_push_constants(struct brw_context *brw) if (gp) { /* CACHE_NEW_GS_PROG */ - const struct brw_vec4_prog_data *prog_data = &brw->gs.prog_data->base; + const struct brw_stage_prog_data *prog_data = &brw->gs.prog_data->base.base; struct brw_stage_state *stage_state = &brw->gs.base; - gen6_upload_vec4_push_constants(brw, &gp->program.Base, prog_data, - stage_state, AUB_TRACE_VS_CONSTANTS); + gen6_upload_push_constants(brw, &gp->program.Base, prog_data, + stage_state, AUB_TRACE_VS_CONSTANTS); } gen7_upload_constant_state(brw, stage_state, gp, _3DSTATE_CONSTANT_GS); |