diff options
author | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
commit | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (patch) | |
tree | 0298f6e38550e2f888eab0146ce7a51a49faaa10 /mesalib/src/mesa/state_tracker/st_cb_texture.c | |
parent | 0e68f72b7b0ab957a0d3c9415f68e3c4f484b0b3 (diff) | |
parent | bee9191042416cbfb848615189ca1e2a0069f022 (diff) | |
download | vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.gz vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.bz2 vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_texture.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 354e58de9..8df753f7c 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -1707,7 +1707,7 @@ st_finalize_texture(struct gl_context *ctx, firstImage->base.Width2, firstImage->base.Height2, firstImage->base.Depth2, - stObj->base.BaseLevel, + firstImage->base.Level, &width, &height, &depth)) { width = stObj->width0; height = stObj->height0; |