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

i965: Prepare slice copy for isl based miptrees

Browse Source 
v2 (Jason): Fix a helper variable only used for assert -
            open code instead.

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Topi Pohjolainen
2017-05-01 08:43:19 +03:00
parent de158c1e43
commit 71ac909137
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+22 -6
View File
@@ -1318,7 +1318,8 @@ intel_miptree_copy_slice_sw(struct brw_context *brw,
{
void *src, *dst;
ptrdiff_t src_stride, dst_stride;
int cpp = dst_mt->cpp;
const unsigned cpp = dst_mt->surf.size > 0 ?
(isl_format_get_layout(dst_mt->surf.format)->bpb / 8) : dst_mt->cpp;
intel_miptree_map(brw, src_mt,
src_level, src_layer,
@@ -1379,13 +1380,28 @@ intel_miptree_copy_slice(struct brw_context *brw,
unsigned dst_level, unsigned dst_layer)
{
uint32_t width = minify(src_mt->physical_width0,
src_level - src_mt->first_level);
uint32_t height = minify(src_mt->physical_height0,
src_level - src_mt->first_level);
mesa_format format = src_mt->format;
uint32_t width, height;
if (src_mt->surf.size > 0) {
width = minify(src_mt->surf.phys_level0_sa.width,
src_level - src_mt->first_level);
height = minify(src_mt->surf.phys_level0_sa.height,
src_level - src_mt->first_level);
if (src_mt->surf.dim == ISL_SURF_DIM_3D)
assert(src_layer < minify(src_mt->surf.phys_level0_sa.depth,
src_level - src_mt->first_level));
else
assert(src_layer < src_mt->surf.phys_level0_sa.array_len);
} else {
width = minify(src_mt->physical_width0,
src_level - src_mt->first_level);
height = minify(src_mt->physical_height0,
src_level - src_mt->first_level);
assert(src_layer < src_mt->level[src_level].depth);
}
assert(src_layer < src_mt->level[src_level].depth);
assert(src_mt->format == dst_mt->format);
if (dst_mt->compressed) {