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

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>
This commit is contained in:
Mike Blumenkrantz
2022-06-16 13:46:56 -04:00
committed by Marge Bot
parent b37d97bb86
commit dd5d215c62
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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