From 759d84177e87cc82afadeca7953c47848668fda0 Mon Sep 17 00:00:00 2001 From: Neha Bhende Date: Thu, 27 Oct 2016 12:35:03 -0700 Subject: svga: loop over box.depth for ReadBack_image on each slice piglit test ext_texture_array-gen-mipmap is fixed with this patch. Tested with mtt piglit, glretrace, viewperf and conform. No regression. Reviewed-by: Brian Paul (cherry picked from commit 31fe1d10b291bcd1b9ee376d53db05028719831d) --- src/gallium/drivers/svga/svga_resource_texture.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/svga/svga_resource_texture.c b/src/gallium/drivers/svga/svga_resource_texture.c index 20580e9dd92..11a8749379e 100644 --- a/src/gallium/drivers/svga/svga_resource_texture.c +++ b/src/gallium/drivers/svga/svga_resource_texture.c @@ -410,7 +410,7 @@ svga_texture_transfer_map_direct(struct svga_context *svga, struct svga_texture *tex = svga_texture(texture); struct svga_winsys_surface *surf = tex->handle; unsigned level = st->base.level; - unsigned w, h, nblocksx, nblocksy; + unsigned w, h, nblocksx, nblocksy, i; unsigned usage = st->base.usage; if (need_tex_readback(transfer)) { @@ -418,13 +418,14 @@ svga_texture_transfer_map_direct(struct svga_context *svga, svga_surfaces_flush(svga); - if (svga_have_vgpu10(svga)) { - ret = readback_image_vgpu10(svga, surf, st->slice, level, - tex->b.b.last_level + 1); - } else { - ret = readback_image_vgpu9(svga, surf, st->slice, level); + for (i = 0; i < st->base.box.depth; i++) { + if (svga_have_vgpu10(svga)) { + ret = readback_image_vgpu10(svga, surf, st->slice + i, level, + tex->b.b.last_level + 1); + } else { + ret = readback_image_vgpu9(svga, surf, st->slice + i, level); + } } - svga->hud.num_readbacks++; SVGA_STATS_COUNT_INC(sws, SVGA_STATS_COUNT_TEXREADBACK); -- cgit v1.2.3