summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-03-05 12:27:46 -0800
committerEric Anholt <eric@anholt.net>2010-03-05 15:23:30 -0800
commit8a9d8bd52af4414e59320c68238b8929edf3ff80 (patch)
tree2c06aab7f9237f3798f503c50dc559a5cefc63b8 /src/mesa/drivers
parentf6f5e8767926932dc276015ce84b74a0d01ade65 (diff)
intel: Check that the batch is mapped per BEGIN, not each OUT.
Shaves 800 bytes off the driver.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/intel/intel_batchbuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.h b/src/mesa/drivers/dri/intel/intel_batchbuffer.h
index 79bdbc17ae..860aa1327a 100644
--- a/src/mesa/drivers/dri/intel/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/intel/intel_batchbuffer.h
@@ -86,7 +86,6 @@ intel_batchbuffer_space(struct intel_batchbuffer *batch)
static INLINE void
intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch, GLuint dword)
{
- assert(batch->map);
assert(intel_batchbuffer_space(batch) >= 4);
*(GLuint *) (batch->ptr) = dword;
batch->ptr += 4;
@@ -118,6 +117,7 @@ static INLINE uint32_t float_as_int(float f)
#define BEGIN_BATCH(n) do { \
intel_batchbuffer_require_space(intel->batch, (n)*4); \
+ assert(intel->batch->map); \
assert(intel->batch->emit.start_ptr == NULL); \
intel->batch->emit.total = (n) * 4; \
intel->batch->emit.start_ptr = intel->batch->ptr; \