diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
| commit | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (patch) | |
| tree | 222a1d19624e55a205786f54edd7892aae79a7bd /mesalib/src/mesa/state_tracker/st_cb_texture.c | |
| parent | b929a2bab9e244cbc823f7bb2fe9e21537e3ceb7 (diff) | |
| parent | 281f26a1dfda732687680a36857960f74608df5b (diff) | |
| download | vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.gz vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.bz2 vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 5 |
1 files changed, 4 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 b19dc67bf..6c287b3d4 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -1120,7 +1120,10 @@ copy_image_data_to_texture(struct st_context *st, assert(src_level <= stImage->pt->last_level); assert(u_minify(stImage->pt->width0, src_level) == stImage->base.Width); - assert(u_minify(stImage->pt->height0, src_level) == stImage->base.Height); + assert(stImage->pt->target == PIPE_TEXTURE_1D_ARRAY || + u_minify(stImage->pt->height0, src_level) == stImage->base.Height); + assert(stImage->pt->target == PIPE_TEXTURE_2D_ARRAY || + u_minify(stImage->pt->depth0, src_level) == stImage->base.Depth); st_texture_image_copy(st->pipe, stObj->pt, dstLevel, /* dest texture, level */ |