diff options
| author | Eric Anholt <eric@anholt.net> | 2014-05-19 10:10:01 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-07-02 12:45:59 -0700 |
| commit | c0f1929dd23bbc558e9eef0f8fd40e10dfef3c21 (patch) | |
| tree | e3ffee1f9ab5bda192a0596af8ce374afa67a97f /src/mesa/drivers/dri/i965/gen6_wm_state.c | |
| parent | 5ba31c34d8676b713ed031842489e166406d1afc (diff) | |
| download | external_mesa3d-c0f1929dd23bbc558e9eef0f8fd40e10dfef3c21.zip external_mesa3d-c0f1929dd23bbc558e9eef0f8fd40e10dfef3c21.tar.gz external_mesa3d-c0f1929dd23bbc558e9eef0f8fd40e10dfef3c21.tar.bz2 | |
i965: Move dispatch_grf_start_reg and first_curbe_grf into stage_prog_data.
I wanted to access this value from stage-generic code, so stop storing it
under two different names.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_wm_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_wm_state.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c index 402d9c3..042b47d 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -69,7 +69,8 @@ gen6_upload_wm_push_constants(struct brw_context *brw) fprintf(stderr, "WM constants:\n"); for (i = 0; i < prog_data->base.nr_params; i++) { if ((i & 7) == 0) - fprintf(stderr, "g%d: ", prog_data->first_curbe_grf + i / 8); + fprintf(stderr, "g%d: ", + prog_data->base.dispatch_grf_start_reg + i / 8); fprintf(stderr, "%8f ", constants[i]); if ((i & 7) == 7) fprintf(stderr, "\n"); @@ -174,17 +175,17 @@ upload_wm_state(struct brw_context *brw) if (min_inv_per_frag == 1) { dw5 |= GEN6_WM_8_DISPATCH_ENABLE; - dw4 |= (brw->wm.prog_data->first_curbe_grf << + dw4 |= (brw->wm.prog_data->base.dispatch_grf_start_reg << GEN6_WM_DISPATCH_START_GRF_SHIFT_0); - dw4 |= (brw->wm.prog_data->first_curbe_grf_16 << + dw4 |= (brw->wm.prog_data->dispatch_grf_start_reg_16 << GEN6_WM_DISPATCH_START_GRF_SHIFT_2); } else - dw4 |= (brw->wm.prog_data->first_curbe_grf_16 << + dw4 |= (brw->wm.prog_data->dispatch_grf_start_reg_16 << GEN6_WM_DISPATCH_START_GRF_SHIFT_0); } else { dw5 |= GEN6_WM_8_DISPATCH_ENABLE; - dw4 |= (brw->wm.prog_data->first_curbe_grf << + dw4 |= (brw->wm.prog_data->base.dispatch_grf_start_reg << GEN6_WM_DISPATCH_START_GRF_SHIFT_0); } |