From 42d4f89264f193e8beae7ba975df3507b81b6da0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 6 May 2008 15:25:51 -0700 Subject: [PATCH] GEM: Fix previous commit to avoid asserting when we run into reserved space. These are the dwords that the reserved space is for. --- src/mesa/drivers/dri/intel/intel_batchbuffer.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.c b/src/mesa/drivers/dri/intel/intel_batchbuffer.c index ef66fd75ac2..bab8e645d41 100644 --- a/src/mesa/drivers/dri/intel/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/intel/intel_batchbuffer.c @@ -206,16 +206,21 @@ _intel_batchbuffer_flush(struct intel_batchbuffer *batch, const char *file, used); /* Emit a flush if the bufmgr doesn't do it for us. */ - if (!intel->ttm) - intel_batchbuffer_emit_dword(intel->batch, intel->vtbl.flush_cmd()); + if (!intel->ttm) { + *(GLuint *) (batch->ptr) = intel->vtbl.flush_cmd(); + batch->ptr += 4; + } /* Round batchbuffer usage to 2 DWORDs. */ used = batch->ptr - batch->map; - if ((used & 4) == 0) - intel_batchbuffer_emit_dword(intel->batch, 0); /* noop */ + if ((used & 4) == 0) { + *(GLuint *) (batch->ptr) = 0; /* noop */ + batch->ptr += 4; + } /* Mark the end of the buffer. */ - intel_batchbuffer_emit_dword(intel->batch, MI_BATCH_BUFFER_END); + *(GLuint *) (batch->ptr) = MI_BATCH_BUFFER_END; /* noop */ + batch->ptr += 4; used = batch->ptr - batch->map; -- 2.30.2