AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: remove unused variable from image map

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12422>
This commit is contained in:
Mike Blumenkrantz
2021-07-30 10:23:48 -04:00
parent c5a6ebc605
commit 97545a0a1f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_resource.c
+6 -6
View File
@@ -1221,7 +1221,7 @@ zink_image_map(struct pipe_context *pctx,
trans->base.b.level = level;
void *ptr, *base;
void *ptr;
if (usage & PIPE_MAP_WRITE && !(usage & PIPE_MAP_READ))
/* this is like a blit, so we can potentially dump some clears or maybe we have to */
zink_fb_clears_apply_or_discard(ctx, pres, zink_rect_from_box(box), false);
@@ -1265,13 +1265,13 @@ zink_image_map(struct pipe_context *pctx,
zink_fence_wait(pctx);
}
ptr = base = map_resource(screen, staging_res);
if (!base)
ptr = map_resource(screen, staging_res);
if (!ptr)
return NULL;
} else {
assert(!res->optimal_tiling);
base = map_resource(screen, res);
if (!base)
ptr = map_resource(screen, res);
if (!ptr)
return NULL;
if (zink_resource_has_usage(res)) {
if (usage & PIPE_MAP_WRITE)
@@ -1303,7 +1303,7 @@ zink_image_map(struct pipe_context *pctx,
VkMappedMemoryRange range = zink_resource_init_mem_range(screen, res->obj, res->obj->offset + offset, size);
vkFlushMappedMemoryRanges(screen->dev, 1, &range);
}
ptr = ((uint8_t *)base) + offset;
ptr = ((uint8_t *)ptr) + offset;
}
if (sizeof(void*) == 4)
trans->base.b.usage |= ZINK_MAP_TEMPORARY;