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

zink: verify that src and dst aspects are the same in resource_copy_region hook

Browse Source 
this is required by spec

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6263>
This commit is contained in:
Mike Blumenkrantz
2020-06-15 11:48:29 -04:00
committed by Marge Bot
parent 6feec2d40e
commit 0051551701
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/zink/zink_context.c
View File

@@ -913,6 +913,17 @@ zink_resource_copy_region(struct pipe_context *pctx,
struct zink_context *ctx = zink_context(pctx); struct zink_context *ctx = zink_context(pctx);
if (dst->base.target != PIPE_BUFFER && src->base.target != PIPE_BUFFER) { if (dst->base.target != PIPE_BUFFER && src->base.target != PIPE_BUFFER) {
VkImageCopy region = {}; VkImageCopy region = {};
if (util_format_get_num_planes(src->base.format) == 1 &&
util_format_get_num_planes(dst->base.format) == 1) {
/* If neither the calling command’s srcImage nor the calling command’s dstImage
* has a multi-planar image format then the aspectMask member of srcSubresource
* and dstSubresource must match
*
* -VkImageCopy spec
*/
assert(src->aspect == dst->aspect);
} else
unreachable("planar formats not yet handled");
region.srcSubresource.aspectMask = src->aspect; region.srcSubresource.aspectMask = src->aspect;
region.srcSubresource.mipLevel = src_level; region.srcSubresource.mipLevel = src_level;