Mesa (master): intel: Use core mesa support for determining lastLevel.
Eric Anholt
anholt at kemper.freedesktop.org
Sat Nov 17 21:05:11 UTC 2012
Module: Mesa
Branch: master
Commit: df3361df01e35aae9f379f0687490ba409841cfb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df3361df01e35aae9f379f0687490ba409841cfb
Author: Eric Anholt <eric at anholt.net>
Date: Tue Nov 13 12:45:35 2012 -0800
intel: Use core mesa support for determining lastLevel.
We had similar issues with using depth in determining the lastLevel of array
textures.
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_tex_image.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 7b9638f..8e623f0 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -84,10 +84,10 @@ intel_miptree_create_for_teximage(struct intel_context *intel,
intelImage->base.Base.Level == firstLevel &&
(intel->gen < 4 || firstLevel == 0)) {
lastLevel = firstLevel;
- } else if (intelObj->base.Target == GL_TEXTURE_EXTERNAL_OES) {
- lastLevel = firstLevel;
} else {
- lastLevel = firstLevel + _mesa_logbase2(MAX2(MAX2(width, height), depth));
+ lastLevel = (firstLevel +
+ _mesa_get_tex_max_num_levels(intelObj->base.Target,
+ width, height, depth) - 1);
}
}
More information about the mesa-commit
mailing list