KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svga: Use texture_copy_region instead of texture_copy_handle for multisampling 

This fixes some of tests cases in arb_copy_image-formats and also fixes
SurfaceCopy related errors in vmware.log when multi sampled surfaces are
used.

Tested with piglit, glretrace on windows and linux VM.

v2: As per Brian's comment

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Neha Bhende 2017-12-13 15:02:13 -08:00 committed by Brian Paul
parent fdf5885183
commit c6103328ab
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gallium/drivers/svga/svga_surface.c
View File

@ -170,15 +170,24 @@ svga_texture_copy_handle_resource(struct svga_context *svga,
unsigned depth = (zslice_pick < 0 ?
u_minify(src_tex->b.b.depth0, miplevel) : 1);
svga_texture_copy_handle(svga,
src_tex->handle,
0, 0, zoffset,
miplevel,
j + layeroffset,
dst, 0, 0, 0, i, j,
u_minify(src_tex->b.b.width0, miplevel),
u_minify(src_tex->b.b.height0, miplevel),
depth);
if (src_tex->b.b.nr_samples > 1) {
unsigned subResource = j * numMipLevels + i;
svga_texture_copy_region(svga, src_tex->handle,
subResource, 0, 0, zoffset,
dst, subResource, 0, 0, 0,
src_tex->b.b.width0, src_tex->b.b.height0, depth);
}
else {
svga_texture_copy_handle(svga,
src_tex->handle,
0, 0, zoffset,
miplevel,
j + layeroffset,
dst, 0, 0, 0, i, j,
u_minify(src_tex->b.b.width0, miplevel),
u_minify(src_tex->b.b.height0, miplevel),
depth);
}
}
}
}