diff options
author | marha <marha@users.sourceforge.net> | 2011-01-29 19:45:53 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-01-29 19:45:53 +0000 |
commit | f04df7c7d4200343558dc9a14b6f48d10dedefcb (patch) | |
tree | a988fc1e4d433fbbbeb98915f611d5bf557465a9 /mesalib/src/mesa/state_tracker/st_gen_mipmap.c | |
parent | 1c4b85ef1eee929ccef4fb91f9f87f996b7b9e2d (diff) | |
parent | cacf23d832a26e35851c9cc666304ac72cf8fe34 (diff) | |
download | vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.tar.gz vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.tar.bz2 vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_gen_mipmap.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_gen_mipmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c index a7dfbea1a..0be66a2c2 100644 --- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c +++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c @@ -352,6 +352,7 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target, oldTex->width0,
oldTex->height0,
oldTex->depth0,
+ oldTex->array_size,
oldTex->bind);
/* The texture isn't in a "complete" state yet so set the expected
|