diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-25 09:59:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-25 09:59:33 +0200 |
| commit | 281f26a1dfda732687680a36857960f74608df5b (patch) | |
| tree | 2dada31e73b6e8a6d4e1202999a88377d0eebbf3 /mesalib/src/mesa/state_tracker/st_cb_texture.c | |
| parent | 34d741a3fc96c9424ffec29b114a1bdfde40f8b0 (diff) | |
| download | vcxsrv-281f26a1dfda732687680a36857960f74608df5b.tar.gz vcxsrv-281f26a1dfda732687680a36857960f74608df5b.tar.bz2 vcxsrv-281f26a1dfda732687680a36857960f74608df5b.zip | |
fontconfig mesa pixman git update
fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822
mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a
pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
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 */ |