From: Michel Dänzer <daenzer@vmware.com>
Date: Mon, 5 Oct 2009 10:31:51 +0000 (+0200)
Subject: Use _mesa_select_tex_image() rather than hardcoding face 0.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=43750f1575e366e2a92b71bffceee90d7f1a2b3e;p=mesa.git

Use _mesa_select_tex_image() rather than hardcoding face 0.

Fixes crash loading a map in sauerbraten with

hwmipmap 1

in ~/.sauerbraten/config.cfg.
---

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 4d3e62572d5..c3928fa513f 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1501,8 +1501,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
    GLuint comps;
 
    ASSERT(texObj);
-   /* XXX choose cube map face here??? */
-   srcImage = texObj->Image[0][texObj->BaseLevel];
+   srcImage = _mesa_select_tex_image(ctx, texObj, target, texObj->BaseLevel);
    ASSERT(srcImage);
 
    maxLevels = _mesa_max_texture_levels(ctx, texObj->Target);