From: Ian Romanick Date: Wed, 1 Feb 2012 18:37:54 +0000 (-0700) Subject: intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65b096aeddd9b45ca038f44cc9adfff86c8c48b2;p=mesa.git 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 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328 Cc: Eric Anholt Reviewed-by: Chad Versace --- diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.c b/src/mesa/drivers/dri/intel/intel_batchbuffer.c index f4bc6b2cd0b..c58dee806db 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;