Mesa (master): intel: move blit call out of assert()

Brian Paul brianp at kemper.freedesktop.org
Fri Aug 7 15:52:19 UTC 2009


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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Aug  5 16:31:08 2009 -0600

intel: move blit call out of assert()

---

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

diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 7525cd9..69574f2 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -452,6 +452,7 @@ void
 intel_region_cow(struct intel_context *intel, struct intel_region *region)
 {
    struct intel_buffer_object *pbo = region->pbo;
+   GLboolean ok;
 
    intel_region_release_pbo(intel, region);
 
@@ -463,13 +464,14 @@ intel_region_cow(struct intel_context *intel, struct intel_region *region)
     */
 
    LOCK_HARDWARE(intel);
-   assert(intelEmitCopyBlit(intel,
-			    region->cpp,
-			    region->pitch, pbo->buffer, 0, region->tiling,
-			    region->pitch, region->buffer, 0, region->tiling,
-			    0, 0, 0, 0,
-			    region->pitch, region->height,
-			    GL_COPY));
+   ok = intelEmitCopyBlit(intel,
+                          region->cpp,
+                          region->pitch, pbo->buffer, 0, region->tiling,
+                          region->pitch, region->buffer, 0, region->tiling,
+                          0, 0, 0, 0,
+                          region->pitch, region->height,
+                          GL_COPY);
+   assert(ok);
    UNLOCK_HARDWARE(intel);
 }
 




More information about the mesa-commit mailing list