diff options
author | Eric Anholt <[email protected]> | 2007-12-14 13:28:39 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2007-12-14 14:40:03 -0800 |
commit | c5456a6b24525e9307e58fc2a02a6f62ca507730 (patch) | |
tree | 191aeca7e1359304d07540cf1e89ac9b1f0d9005 /src/mesa | |
parent | 84a076079d3a038115a39b1c283b46a574591e07 (diff) |
[intel] Remove useless intel_region_idle.
The idling it was trying to ensure was covered by the
intel_miptree_image_map()->intel_region_map() that immediately followed it.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_regions.c | 17 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_regions.h | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_image.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_subimage.c | 3 |
4 files changed, 0 insertions, 27 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c index a47b2880907..56ca6d2fd27 100644 --- a/src/mesa/drivers/dri/intel/intel_regions.c +++ b/src/mesa/drivers/dri/intel/intel_regions.c @@ -49,23 +49,6 @@ #define FILE_DEBUG_FLAG DEBUG_REGION -void -intel_region_idle(struct intel_context *intel, struct intel_region *region) -{ - DBG("%s\n", __FUNCTION__); - /* XXX: Using this function is likely bogus -- it ought to only have been - * used before a map, anyway, but leave this cheap implementation of it - * for now. - */ - if (region && region->buffer) { - /* Mapping it for read will ensure that any acceleration to the region - * would have landed already. - */ - dri_bo_map(region->buffer, GL_TRUE); - dri_bo_unmap(region->buffer); - } -} - /* XXX: Thread safety? */ GLubyte * diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h index 1975d729e47..b6a3b5a7397 100644 --- a/src/mesa/drivers/dri/intel/intel_regions.h +++ b/src/mesa/drivers/dri/intel/intel_regions.h @@ -73,9 +73,6 @@ void intel_region_release(struct intel_region **ib); void intel_recreate_static_regions(struct intel_context *intel); -void intel_region_idle(struct intel_context *intel, - struct intel_region *ib); - /* Map/unmap regions. This is refcounted also: */ GLubyte *intel_region_map(struct intel_context *intel, diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index fd800a7bb68..c2af74095c9 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -457,10 +457,6 @@ intelTexImage(GLcontext * ctx, if (!pixels) return; - - if (intelImage->mt) - intel_region_idle(intel, intelImage->mt->region); - LOCK_HARDWARE(intel); if (intelImage->mt) { diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c index 32de2cfb48e..5410df203f4 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c @@ -64,9 +64,6 @@ intelTexSubimage(GLcontext * ctx, if (!pixels) return; - if (intelImage->mt) - intel_region_idle(intel, intelImage->mt->region); - LOCK_HARDWARE(intel); /* Map buffer if necessary. Need to lock to prevent other contexts |