intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 1 Feb 2012 18:37:54 +0000 (11:37 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 7 Feb 2012 18:00:31 +0000 (10:00 -0800)
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@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
src/mesa/drivers/dri/intel/intel_batchbuffer.c

index f4bc6b2cd0b576269502c468b845fc3ea772b062..c58dee806db46c39b9cae56d6d10f296c7d44481 100644 (file)
@@ -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;