diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2011-05-26 10:47:31 -0700 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2011-05-26 10:47:31 -0700 |
| commit | 187cb6a86b6baa8934d5b687615971948df79253 (patch) | |
| tree | fc6286a193fc4f849efca6998a898acefe903ff8 | |
| parent | c193c032109a265833cff3487443e068741ae77b (diff) | |
scratched needs to always be allocated for bpsystem_routine_temp
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_wm_state.c | 10 |
1 files changed, 5 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 63eec1f6cf..108c613a48 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -184,13 +184,13 @@ upload_wm_state(struct brw_context *brw) OUT_BATCH(_3DSTATE_WM << 16 | (9 - 2)); OUT_RELOC(brw->wm.prog_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0); OUT_BATCH(dw2); - if (brw->wm.prog_data->total_scratch) { - if (INTEL_DEBUG & DEBUG_BP) { - OUT_BATCH(brw->wm.scratch_bo->offset | 6); - } else { + + /* Breakpoint always needs scratch space */ + if (INTEL_DEBUG & DEBUG_BP) { + OUT_BATCH(brw->wm.scratch_bo->offset | 6); + } else if (brw->wm.prog_data->total_scratch) { OUT_RELOC(brw->wm.scratch_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, ffs(brw->wm.prog_data->total_scratch) - 11); - } } else { OUT_BATCH(0); } |