fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 08:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: rename a variable

Browse source 
make this a little clearer to read

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17095>
(cherry picked from commit dd5d215c62)
This commit is contained in:
Mike Blumenkrantz 2022-06-16 13:46:56 -04:00 • committed by Dylan Baker
parent c6a569f242
commit 689cad731d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -121,7 +121,7 @@
"description": "zink: rename a variable",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

10
src/gallium/drivers/zink/zink_resource.c
View file

@ -1824,17 +1824,17 @@ zink_transfer_flush_region(struct pipe_context *pctx,
struct zink_screen *screen = zink_screen(pctx->screen);
struct zink_resource *m = trans->staging_res ? zink_resource(trans->staging_res) :
res;
ASSERTED VkDeviceSize size, offset;
ASSERTED VkDeviceSize size, src_offset;
if (m->obj->is_buffer) {
size = box->width;
offset = trans->offset;
src_offset = trans->offset;
} else {
size = (VkDeviceSize)box->width * box->height * util_format_get_blocksize(m->base.b.format);
offset = trans->offset +
src_offset = trans->offset +
box->z * trans->depthPitch +
util_format_get_2d_size(m->base.b.format, trans->base.b.stride, box->y) +
util_format_get_stride(m->base.b.format, box->x);
assert(offset + size <= res->obj->size);
assert(src_offset + size <= res->obj->size);
}
if (!m->obj->coherent) {
VkMappedMemoryRange range = zink_resource_init_mem_range(screen, m->obj, m->obj->offset, m->obj->size);
@ -1846,7 +1846,7 @@ zink_transfer_flush_region(struct pipe_context *pctx,
struct zink_resource *staging_res = zink_resource(trans->staging_res);
if (ptrans->resource->target == PIPE_BUFFER)
zink_copy_buffer(ctx, res, staging_res, box->x, offset, box->width);
zink_copy_buffer(ctx, res, staging_res, box->x, src_offset, box->width);
else
zink_transfer_copy_bufimage(ctx, res, staging_res, trans);
}