From 76870cfae2dcd30743c895f99250b93e91d5346c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 11 Dec 2020 10:53:53 -0500 Subject: [PATCH] zink: fix direct image mapping offset the x and y offsets here were improperly calculated without taking into account: * layer/level offset * x/y coord bpp Fixes: 8d46e35d16e ("zink: introduce opengl over vulkan") Reviewed-by: Erik Faye-Lund Part-of: (cherry picked from commit 456b57802eaf95d36e7b950bdb5ffd86a1c0dc63) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_resource.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 505decd5ef7..abf0f14556b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -301,7 +301,7 @@ "description": "zink: fix direct image mapping offset", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "8d46e35d16e3936968958bcab86d61967a673305" }, diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index ee38909eab8..5eb1012da48 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -523,9 +523,12 @@ zink_transfer_map(struct pipe_context *pctx, vkGetImageSubresourceLayout(screen->dev, res->image, &isr, &srl); trans->base.stride = srl.rowPitch; trans->base.layer_stride = srl.arrayPitch; - ptr = ((uint8_t *)ptr) + box->z * srl.depthPitch + - box->y * srl.rowPitch + - box->x; + const struct util_format_description *desc = util_format_description(res->format); + unsigned offset = srl.offset + + box->z * srl.depthPitch + + (box->y / desc->block.height) * srl.rowPitch + + (box->x / desc->block.width) * (util_format_get_blocksize(res->format) / desc->nr_channels); + ptr = ((uint8_t *)ptr) + offset; } }