From dfd0f042e0d8faa374629ea0a67422edff6d48c3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 12 Dec 2020 11:59:40 -0500 Subject: [PATCH] zink: really fix direct image mapping offset (I mean it this time) I got confused and: * used the vkformat instead of the pipe format for getting format description * incorrectly calculated bpp but this time it's definitely 100% fixed I promise Fixes: 456b57802ea ("zink: fix direct image mapping offset") Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 9f8dde749b6..7d37b52fc97 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -613,11 +613,11 @@ 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; - const struct util_format_description *desc = util_format_description(res->format); + const struct util_format_description *desc = util_format_description(res->base.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); + (box->x / desc->block.width) * (desc->block.bits / 8); ptr = ((uint8_t *)ptr) + offset; } }