Use _mesa_select_tex_image() rather than hardcoding face 0.
authorMichel Dänzer <daenzer@vmware.com>
Mon, 5 Oct 2009 10:31:51 +0000 (12:31 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Mon, 5 Oct 2009 10:31:51 +0000 (12:31 +0200)
Fixes crash loading a map in sauerbraten with

hwmipmap 1

in ~/.sauerbraten/config.cfg.

src/mesa/main/mipmap.c

index 4d3e62572d5149304147eaf50efbfe2cecba63f8..c3928fa513f00e06e21a46a4e78d6cdde4a8c8bd 100644 (file)
@@ -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);