fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

svga: fix texture array update regression

Browse source 
With commit fb9fe35, we start using transfer_inline_write
for memcpy TexSubImage path, but that triggers a regression with
texture array in the svga driver.

With this patch, the direct map code will update the texture array
correctly.

Fixes VMware bug 1679293.

Tested with MTT piglit, glretrace, conform.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Charmaine Lee 2016-06-21 10:12:22 -07:00 • committed by Brian Paul
parent d4a77254cb
commit 2aa9ff0cda
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/gallium/drivers/svga/svga_resource_texture.c
View file

@ -547,6 +547,13 @@ svga_texture_transfer_map(struct pipe_context *pipe,
baseLevelSize.height = tex->b.b.height0; baseLevelSize.height = tex->b.b.height0;
baseLevelSize.depth = tex->b.b.depth0; baseLevelSize.depth = tex->b.b.depth0;
if ((tex->b.b.target == PIPE_TEXTURE_1D_ARRAY) ||
(tex->b.b.target == PIPE_TEXTURE_2D_ARRAY)) {
st->base.layer_stride =
svga3dsurface_get_image_offset(tex->key.format, baseLevelSize,
tex->b.b.last_level + 1, 1, 0);
}
offset = svga3dsurface_get_image_offset(tex->key.format, baseLevelSize, offset = svga3dsurface_get_image_offset(tex->key.format, baseLevelSize,
tex->b.b.last_level + 1, /* numMips */ tex->b.b.last_level + 1, /* numMips */
st->slice, level); st->slice, level);
@ -673,27 +680,35 @@ svga_texture_transfer_unmap(struct pipe_context *pipe,
svga_texture(transfer->resource)->handle; svga_texture(transfer->resource)->handle;
SVGA3dBox box; SVGA3dBox box;
enum pipe_error ret; enum pipe_error ret;
unsigned nlayers = 1;
assert(svga_have_gb_objects(svga)); assert(svga_have_gb_objects(svga));
/* update the effected region */ /* update the effected region */
box.x = transfer->box.x; box.x = transfer->box.x;
box.y = transfer->box.y; box.y = transfer->box.y;
box.w = transfer->box.width;
box.h = transfer->box.height;
box.d = transfer->box.depth;
switch (tex->b.b.target) { switch (tex->b.b.target) {
case PIPE_TEXTURE_CUBE: case PIPE_TEXTURE_CUBE:
case PIPE_TEXTURE_2D_ARRAY:
box.z = 0; box.z = 0;
break; break;
case PIPE_TEXTURE_2D_ARRAY:
nlayers = box.d;
box.z = 0;
box.d = 1;
break;
case PIPE_TEXTURE_1D_ARRAY: case PIPE_TEXTURE_1D_ARRAY:
nlayers = box.d;
box.y = box.z = 0; box.y = box.z = 0;
box.d = 1;
break; break;
default: default:
box.z = transfer->box.z; box.z = transfer->box.z;
break; break;
} }
box.w = transfer->box.width;
box.h = transfer->box.height;
box.d = transfer->box.depth;
if (0) if (0)
debug_printf("%s %d, %d, %d %d x %d x %d\n", debug_printf("%s %d, %d, %d %d x %d x %d\n",
@ -702,15 +717,21 @@ svga_texture_transfer_unmap(struct pipe_context *pipe,
box.w, box.h, box.d); box.w, box.h, box.d);
if (svga_have_vgpu10(svga)) { if (svga_have_vgpu10(svga)) {
ret = update_image_vgpu10(svga, surf, &box, st->slice, transfer->level, unsigned i;
for (i = 0; i < nlayers; i++) {
ret = update_image_vgpu10(svga, surf, &box,
st->slice + i, transfer->level,
tex->b.b.last_level + 1); tex->b.b.last_level + 1);
assert(ret == PIPE_OK);
}
} else { } else {
assert(nlayers == 1);
ret = update_image_vgpu9(svga, surf, &box, st->slice, transfer->level); ret = update_image_vgpu9(svga, surf, &box, st->slice, transfer->level);
assert(ret == PIPE_OK);
} }
svga->hud.num_resource_updates++; svga->hud.num_resource_updates++;
assert(ret == PIPE_OK);
(void) ret; (void) ret;
} }