summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/gen7_wm_state.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2014-09-02 11:38:29 -0700
committerKenneth Graunke <kenneth@whitecape.org>2014-09-03 17:11:33 -0700
commitf92fbd554f2e9e702a2bd650c9b2571a3f4f1ab8 (patch)
treeb6e24c2b40ae16c6c4f636f93b881d4c5e4815dc /src/mesa/drivers/dri/i965/gen7_wm_state.c
parent7528f6fd178ef10b7fde8e66c57bec38127471fd (diff)
downloadexternal_mesa3d-f92fbd554f2e9e702a2bd650c9b2571a3f4f1ab8.zip
external_mesa3d-f92fbd554f2e9e702a2bd650c9b2571a3f4f1ab8.tar.gz
external_mesa3d-f92fbd554f2e9e702a2bd650c9b2571a3f4f1ab8.tar.bz2
i965: Move curb_read_length/total_scratch to brw_stage_prog_data.
All shader stages have these fields, so it makes sense to store them in the common base structure, rather than duplicating them in each. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_wm_state.c')
-rw-r--r--src/mesa/drivers/dri/i965/gen7_wm_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c
index 278cf17..809a249 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c
@@ -252,10 +252,10 @@ upload_ps_state(struct brw_context *brw)
OUT_BATCH(_3DSTATE_PS << 16 | (8 - 2));
OUT_BATCH(ksp0);
OUT_BATCH(dw2);
- if (brw->wm.prog_data->total_scratch) {
+ if (brw->wm.prog_data->base.total_scratch) {
OUT_RELOC(brw->wm.base.scratch_bo,
I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,
- ffs(brw->wm.prog_data->total_scratch) - 11);
+ ffs(brw->wm.prog_data->base.total_scratch) - 11);
} else {
OUT_BATCH(0);
}