iris: Pay attention to blit masks

For combined depth/stencil formats, we may want to only blit one half.
If PIPE_BLIT_Z is set, blit depth; if PIPE_BLIT_S is set, blit stencil.
This commit is contained in:
Kenneth Graunke
2019-01-16 02:02:19 -08:00
parent 7837fec740
commit c81941f1e7

View File

@@ -353,20 +353,31 @@ iris_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
struct blorp_batch blorp_batch; struct blorp_batch blorp_batch;
blorp_batch_init(&ice->blorp, &blorp_batch, batch, blorp_flags); blorp_batch_init(&ice->blorp, &blorp_batch, batch, blorp_flags);
for (int slice = 0; slice < info->dst.box.depth; slice++) { unsigned main_mask;
iris_batch_maybe_flush(batch, 1500); if (info->dst.format == PIPE_FORMAT_S8_UINT)
main_mask = PIPE_MASK_S;
else if (util_format_is_depth_or_stencil(info->dst.format))
main_mask = PIPE_MASK_Z;
else
main_mask = PIPE_MASK_RGBA;
blorp_blit(&blorp_batch, if (info->mask & main_mask) {
&src_surf, info->src.level, info->src.box.z + slice, for (int slice = 0; slice < info->dst.box.depth; slice++) {
src_fmt.fmt, src_fmt.swizzle, iris_batch_maybe_flush(batch, 1500);
&dst_surf, info->dst.level, info->dst.box.z + slice,
dst_fmt.fmt, ISL_SWIZZLE_IDENTITY, blorp_blit(&blorp_batch,
src_x0, src_y0, src_x1, src_y1, &src_surf, info->src.level, info->src.box.z + slice,
dst_x0, dst_y0, dst_x1, dst_y1, src_fmt.fmt, src_fmt.swizzle,
filter, mirror_x, mirror_y); &dst_surf, info->dst.level, info->dst.box.z + slice,
dst_fmt.fmt, ISL_SWIZZLE_IDENTITY,
src_x0, src_y0, src_x1, src_y1,
dst_x0, dst_y0, dst_x1, dst_y1,
filter, mirror_x, mirror_y);
}
} }
if (util_format_is_depth_and_stencil(info->dst.format) && if ((info->mask & PIPE_MASK_S) &&
util_format_is_depth_and_stencil(info->dst.format) &&
util_format_has_stencil(util_format_description(info->src.format))) { util_format_has_stencil(util_format_description(info->src.format))) {
struct iris_resource *src_res, *dst_res, *junk; struct iris_resource *src_res, *dst_res, *junk;
iris_get_depth_stencil_resources(info->src.resource, &junk, &src_res); iris_get_depth_stencil_resources(info->src.resource, &junk, &src_res);