xf86-video-intel: src/intel_batchbuffer.h
Chris Wilson
ickle at kemper.freedesktop.org
Mon Nov 1 04:14:24 PDT 2010
src/intel_batchbuffer.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b5ae596a0746e5a37e86f5b0980f9265e0061142
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Nov 1 11:11:09 2010 +0000
Flush BLT batches before starting an atomic RENDER batch
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_batchbuffer.h b/src/intel_batchbuffer.h
index 5863561..21890c4 100644
--- a/src/intel_batchbuffer.h
+++ b/src/intel_batchbuffer.h
@@ -64,8 +64,11 @@ static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, unsigned int sz)
assert(!intel->in_batch_atomic);
+ if (intel->current_batch != RENDER_BATCH)
+ intel_batch_submit(scrn, FALSE);
+
intel_batch_require_space(scrn, intel, sz * 4);
- intel->current_batch = RENDER_BATCH; \
+ intel->current_batch = RENDER_BATCH;
intel->in_batch_atomic = TRUE;
intel->batch_atomic_limit = intel->batch_used + sz;
More information about the xorg-commit
mailing list