[Mesa-dev] [PATCH] intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush

2012-02-01 Thread Ian Romanick 
From: Ian Romanick ian.d.roman...@intel.com

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.roman...@intel.com
Cc: Eric Anholt e...@anholt.net
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328
---
 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;
 
-- 
1.7.6.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush

2012-02-01 Thread Chad Versace 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 02/01/2012 10:40 AM, Ian Romanick wrote:
 From: Ian Romanick ian.d.roman...@intel.com
 
 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.roman...@intel.com
 Cc: Eric Anholt e...@anholt.net
 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328

- From inspection of how intel_miptree_map() is used, I believe the
assertion can safely be removed.

Reviewed-by: Chad Versace chad.vers...@linux.intel.com
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPKYl1AAoJEAIvNt057x8iNqYP/3VwhK6zNvIFf7i+4LU2Z6LI
RD1Pzb+ib8sUqAMgdelQYSyycVMCmaWxMrRQ+mYYU9TjhBd/W3Uo5hhh6J9LVDqZ
jqwIEcTAspLwB+/q/er8/pOJ+V7/K4YB0/D4n5u1273PSE0/bE1AVm0VOgilQCNU
tTuCJ+By5fc6A5t5DQR3uAiNZuPeGWIouCT0R9IK6drHaAdyM/uZm/bq0Od5aXvk
XRMLefbXZXip3ZDL62YuUAK/x4QEek39fVgoRFUxXzzAZFYF6qderlEt6GbHu0Qa
6an8CTbNGYeLt8fiBbjYocNZlpD7QUQjLk35UI1qpYVkV+rt/6ZEHo3FSBfIW76Q
oay1R0ZmSze/FYvjdiZtFZRJJKmGrN8R8BA/hy/SQDZqhJRpTSVnBVVO/cfiPh9K
m7N5LX/XTeHfWftcrqrHNsVdRIq3s3HVlsQvmlE/24ZZpQcGExsBm3r7j8/tIOpZ
9MJgdIfi4qRZArbW35hfEg6zvoyOnVC7dhMGuZFng0fECjf3D7wM6fXsphaeeMUn
m1zh7DsGz5hj4fyAOAzIlq4Kigh3xtX8bsiIO8d9vyQR1swEcmqpxwR8nQCqttQk
jbot3bx9W31kQnrMdx11GpZUDNWKoZf1l+o74VC5I3Ei+XbNZ8E5mN5o2o7uH1Cl
XdUiq5aBcSSD4luxuTBU
=JooQ
-END PGP SIGNATURE-
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev