Mesa (master): intel: Remove num_mapped_regions tracking.

Eric Anholt anholt at kemper.freedesktop.org
Wed Mar 6 00:14:47 UTC 2013


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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 28 08:57:15 2013 +1100

intel: Remove num_mapped_regions tracking.

The point of tracking the value was removed in February 2012
(65b096aeddd9b45ca038f44cc9adfff86c8c48b2), and this should have
been removed at the same time.

Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

---

 src/mesa/drivers/dri/intel/intel_context.h |    8 --------
 src/mesa/drivers/dri/intel/intel_regions.c |    6 ------
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index 42db5a7..3d2d3ef 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -325,14 +325,6 @@ struct intel_context
     */
    bool is_front_buffer_reading;
 
-   /**
-    * Count of intel_regions that are mapped.
-    *
-    * This allows us to assert that no batch buffer is emitted if a
-    * region is mapped.
-    */
-   int num_mapped_regions;
-
    bool use_texture_tiling;
    bool use_early_z;
 
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 049af43..cfd5bb9 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -140,10 +140,6 @@ intel_region_map(struct intel_context *intel, struct intel_region *region,
 
       region->map = region->bo->virtual;
    }
-   if (region->map) {
-      intel->num_mapped_regions++;
-      region->map_refcount++;
-   }
 
    return region->map;
 }
@@ -159,8 +155,6 @@ intel_region_unmap(struct intel_context *intel, struct intel_region *region)
 	 drm_intel_bo_unmap(region->bo);
 
       region->map = NULL;
-      --intel->num_mapped_regions;
-      assert(intel->num_mapped_regions >= 0);
    }
 }
 




More information about the mesa-commit mailing list