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

d3d12: Fix leaks in map with do-not-wait

Browse Source 
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16182>
This commit is contained in:
Jesse Natalie
2022-04-26 12:48:20 -07:00
committed by Marge Bot
parent 5b46ef9857
commit 32c1b5fd05
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/d3d12/d3d12_resource.cpp
View File

@@ -1252,9 +1252,6 @@ d3d12_transfer_map(struct pipe_context *pctx,
if (!trans)
return NULL;
pipe_resource_reference(&ptrans->resource, pres);
ptrans->resource = pres;
ptrans->level = level;
ptrans->usage = (enum pipe_map_flags)usage;
ptrans->box = *box;
@@ -1275,8 +1272,10 @@ d3d12_transfer_map(struct pipe_context *pctx,
}
range = linear_range(box, ptrans->stride, ptrans->layer_stride);
if (!synchronize(ctx, res, usage, &range))
if (!synchronize(ctx, res, usage, &range)) {
slab_free(transfer_pool, trans);
return NULL;
}
ptr = d3d12_bo_map(res->bo, &range);
} else if (unlikely(pres->format == PIPE_FORMAT_Z24_UNORM_S8_UINT ||
pres->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT)) {
@@ -1331,8 +1330,10 @@ d3d12_transfer_map(struct pipe_context *pctx,
trans->staging_res = pipe_buffer_create(pctx->screen, 0,
staging_usage,
staging_res_size);
if (!trans->staging_res)
if (!trans->staging_res) {
slab_free(transfer_pool, trans);
return NULL;
}
struct d3d12_resource *staging_res = d3d12_resource(trans->staging_res);
@@ -1354,6 +1355,7 @@ d3d12_transfer_map(struct pipe_context *pctx,
ptr = d3d12_bo_map(staging_res->bo, &range);
}
pipe_resource_reference(&ptrans->resource, pres);
*transfer = ptrans;
return ptr;
}