Mesa (master): intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 65b096aeddd9b45ca038f44cc9adfff86c8c48b2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=65b096aeddd9b45ca038f44cc9adfff86c8c48b2

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Feb  1 11:37:54 2012 -0700

intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush

There are cases where a buffer can be mapped while another buffer is
flushed.  This can happen in the CopyPixels meta-op path for piglit's
fbo-mipmap-copypix.  After some discussion with Eric, it seems this
assertion is no longer necessary, and it has always been too strict.

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328
Cc: Eric Anholt <eric at anholt.net>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

---

 src/mesa/drivers/dri/intel/intel_batchbuffer.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.c b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
index f4bc6b2..c58dee8 100644
--- a/src/mesa/drivers/dri/intel/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
@@ -208,13 +208,6 @@ _intel_batchbuffer_flush(struct intel_context *intel,
 {
    int ret;
 
-   /* No batch should be emitted that uses a mapped region, because that would
-    * cause the map to be incoherent with GPU rendering done by the
-    * batchbuffer. To ensure that condition, we assert a condition that is
-    * stronger but easier to implement: that *no* region is mapped.
-    */
-   assert(intel->num_mapped_regions == 0);
-
    if (intel->batch.used == 0)
       return 0;