OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d3d12: Relax multisampling direct copy requirements

Browse Source 
D3D has supported partial copying of MSAA resources as as long as
the sample counts match since D3D10.1

Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14624>
This commit is contained in:
Jesse Natalie
2022-01-14 06:30:27 -08:00
committed by Marge Bot
parent e5cf19fced
commit 2da7db759b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/d3d12/d3d12_blit.cpp
View File

@@ -227,7 +227,7 @@ direct_copy_supported(struct d3d12_screen *screen,
D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED && D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED &&
(info->src.resource->bind & PIPE_BIND_DEPTH_STENCIL || (info->src.resource->bind & PIPE_BIND_DEPTH_STENCIL ||
info->dst.resource->bind & PIPE_BIND_DEPTH_STENCIL)) || info->dst.resource->bind & PIPE_BIND_DEPTH_STENCIL)) ||
info->src.resource->nr_samples > 1) { info->src.resource->nr_samples != info->dst.resource->nr_samples) {
if (info->dst.box.x != 0 || if (info->dst.box.x != 0 ||
info->dst.box.y != 0 || info->dst.box.y != 0 ||
@@ -336,8 +336,7 @@ copy_subregion_no_barriers(struct d3d12_context *ctx,
D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED || D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED ||
(!util_format_is_depth_or_stencil(dst->base.b.format) && (!util_format_is_depth_or_stencil(dst->base.b.format) &&
!util_format_is_depth_or_stencil(src->base.b.format) && !util_format_is_depth_or_stencil(src->base.b.format) &&
dst->base.b.nr_samples <= 1 && dst->base.b.nr_samples == src->base.b.nr_samples));
src->base.b.nr_samples <= 1));
ctx->cmdlist->CopyTextureRegion(&dst_loc, dstx, dsty, dstz, ctx->cmdlist->CopyTextureRegion(&dst_loc, dstx, dsty, dstz,
&src_loc, NULL); &src_loc, NULL);
@@ -355,8 +354,7 @@ copy_subregion_no_barriers(struct d3d12_context *ctx,
D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED || D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED ||
(!util_format_is_depth_or_stencil(dst->base.b.format) && (!util_format_is_depth_or_stencil(dst->base.b.format) &&
!util_format_is_depth_or_stencil(src->base.b.format))) && !util_format_is_depth_or_stencil(src->base.b.format))) &&
dst->base.b.nr_samples <= 1 && dst->base.b.nr_samples == src->base.b.nr_samples);
src->base.b.nr_samples <= 1);
ctx->cmdlist->CopyTextureRegion(&dst_loc, dstx, dsty, dstz, ctx->cmdlist->CopyTextureRegion(&dst_loc, dstx, dsty, dstz,
&src_loc, &src_box); &src_loc, &src_box);