Mesa (mesa_7_6_branch): Use _mesa_select_tex_image() rather than hardcoding face 0.

[Michel Dänzer]

Module: Mesa
Branch: mesa_7_6_branch
Commit: 43750f1575e366e2a92b71bffceee90d7f1a2b3e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=43750f1575e366e2a92b71bffceee90d7f1a2b3e

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Mon Oct  5 12:31:51 2009 +0200

Use _mesa_select_tex_image() rather than hardcoding face 0.

Fixes crash loading a map in sauerbraten with

hwmipmap 1

in ~/.sauerbraten/config.cfg.

---

 src/mesa/main/mipmap.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 4d3e625..c3928fa 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);