From: Eric Anholt <eric@anholt.net>
Date: Fri, 5 Mar 2010 20:27:46 +0000 (-0800)
Subject: intel: Check that the batch is mapped per BEGIN, not each OUT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a9d8bd52af4414e59320c68238b8929edf3ff80;p=mesa.git

intel: Check that the batch is mapped per BEGIN, not each OUT.

Shaves 800 bytes off the driver.
---

diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.h b/src/mesa/drivers/dri/intel/intel_batchbuffer.h
index 79bdbc17ae1..860aa1327a1 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;			\