summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_gen_mipmap.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-04-28 10:10:51 -0600
committerBrian Paul <brianp@vmware.com>2010-04-28 10:10:51 -0600
commitc7f5c9a3dc6350252e73b541bb85ab3ed9e64a9c (patch)
tree2d3eca74c6b3b59a26de5a9ea9d59d839d64115a /src/mesa/state_tracker/st_gen_mipmap.c
parent40dcbb87a9014adf6b3f11f8f0642800f449056c (diff)
parent7b640f9f708306b3e8c661771f29bf24bf8687fb (diff)
Merge branch '7.8'
Conflicts: src/mesa/state_tracker/st_gen_mipmap.c
Diffstat (limited to 'src/mesa/state_tracker/st_gen_mipmap.c')
-rw-r--r--src/mesa/state_tracker/st_gen_mipmap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index 24a072ee12..b8b75c7de6 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -377,7 +377,9 @@ st_generate_mipmap(GLcontext *ctx, GLenum target,
dstImage->TexFormat = srcImage->TexFormat;
- stImage = (struct st_texture_image *) dstImage;
+ stImage = st_texture_image(dstImage);
+ stImage->level = dstLevel;
+
pipe_resource_reference(&stImage->pt, pt);
}
}