Mesa (gallium-0.2): intel: Fix crash in automatic mipmap generation for glCopyTex{Sub,}Image.

Alan Hourihane alanh at kemper.freedesktop.org
Tue Dec 9 16:18:07 UTC 2008


Module: Mesa
Branch: gallium-0.2
Commit: 75b26e18a64b2fb1962e5e49dfaebd257c734ecc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=75b26e18a64b2fb1962e5e49dfaebd257c734ecc

Author: Eric Anholt <eric at anholt.net>
Date:   Sat Dec  6 15:21:47 2008 -0800

intel: Fix crash in automatic mipmap generation for glCopyTex{Sub,}Image.

The images aren't mapped at this point, so we want the generic Mesa path for
GenerateMipmapEXT that does the mapping/unmapping for us.  Ideally Mesa would
just call it for us.

---

 src/mesa/drivers/dri/intel/intel_tex_copy.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index dd932ae..b893990 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -167,7 +167,7 @@ do_copy_texsubimage(struct intel_context *intel,
 
    /* GL_SGIS_generate_mipmap */
    if (intelImage->level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      intel_generate_mipmap(ctx, target, texObj);
+      ctx->Driver.GenerateMipmap(ctx, target, texObj);
    }
 
    return GL_TRUE;




More information about the mesa-commit mailing list