Mesa (master): intel: Reuse intel_miptree_match_image().
Eric Anholt
anholt at kemper.freedesktop.org
Mon Dec 19 21:20:42 UTC 2011
Module: Mesa
Branch: master
Commit: 7978fb4d9fd9c3e07aa1c09eba5571ec8a437d9c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7978fb4d9fd9c3e07aa1c09eba5571ec8a437d9c
Author: Eric Anholt <eric at anholt.net>
Date: Wed Dec 14 20:43:06 2011 -0800
intel: Reuse intel_miptree_match_image().
This little bit of logic was duplicated, which isn't much, but I was
going to need to duplicate a bit of additional logic in the next
commit.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/intel/intel_tex_validate.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index 748fbdc..b0daa2c 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -52,9 +52,6 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
intel_update_max_level(intelObj, sampler);
firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]);
- intel_miptree_get_dimensions_for_image(&firstImage->base.Base,
- &width, &height, &depth);
-
/* Check tree can hold all active levels. Check tree matches
* target, imageFormat, etc.
*
@@ -64,13 +61,10 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
* of that, we just always relayout on baselevel change.
*/
if (intelObj->mt &&
- (intelObj->mt->target != intelObj->base.Target ||
- intelObj->mt->format != firstImage->base.Base.TexFormat ||
+ (!intel_miptree_match_image(intelObj->mt, &firstImage->base.Base) ||
+ intelObj->mt->target != intelObj->base.Target ||
intelObj->mt->first_level != tObj->BaseLevel ||
- intelObj->mt->last_level < intelObj->_MaxLevel ||
- intelObj->mt->width0 != width ||
- intelObj->mt->height0 != height ||
- intelObj->mt->depth0 != depth)) {
+ intelObj->mt->last_level < intelObj->_MaxLevel)) {
intel_miptree_release(&intelObj->mt);
}
@@ -78,6 +72,9 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
/* May need to create a new tree:
*/
if (!intelObj->mt) {
+ intel_miptree_get_dimensions_for_image(&firstImage->base.Base,
+ &width, &height, &depth);
+
intelObj->mt = intel_miptree_create(intel,
intelObj->base.Target,
firstImage->base.Base.TexFormat,
More information about the mesa-commit
mailing list