Mesa (master): i965: skip too small size mipmap
Nan hai Zou
znh at kemper.freedesktop.org
Thu Jan 6 03:37:20 UTC 2011
Module: Mesa
Branch: master
Commit: a728646fb55245477d35e2761c3e0d15099b4cd4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a728646fb55245477d35e2761c3e0d15099b4cd4
Author: Zou Nan hai <nanhai.zou at intel.com>
Date: Thu Jan 6 11:36:23 2011 +0800
i965: skip too small size mipmap
this fixes doom3 crash.
---
src/mesa/drivers/dri/intel/intel_tex_validate.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index f1c6239..31c0a83 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -156,8 +156,10 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
for (i = tObj->BaseLevel; i <= intelObj->_MaxLevel; i++) {
struct intel_texture_image *intelImage =
intel_texture_image(intelObj->base.Image[face][i]);
-
- /* Need to import images in main memory or held in other trees.
+ /* skip too small size mipmap */
+ if (intelImage == NULL)
+ break;
+ /* Need to import images in main memory or held in other trees.
* If it's a render target, then its data isn't needed to be in
* the object tree (otherwise we'd be FBO incomplete), and we need
* to keep track of the image's MT as needing to be pulled in still,
More information about the mesa-commit
mailing list