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

etnaviv: retarget transfer to render resource when necessary

Browse source 
If we have a separate render resource, it may contain more up-to-date
data than what is available in the base resource, so we need to retarget
the transfer to this resource. As the most likely reason for the
existence of the render resource is a multi-tiled render layout we need
to allow this transfer to go through the resolve/blit copy path, as we
can't de-/tile those layouts in software.

Fixes: b962776530 (etnaviv: rework compatible render base)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5051>
(cherry picked from commit 9d1821adf0)
This commit is contained in:
Lucas Stach 2020-05-14 12:59:01 +02:00 • committed by Eric Engestrom
parent 8142a52255
commit 4dac0c36a4
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2092,7 +2092,7 @@
"description": "etnaviv: retarget transfer to render resource when necessary",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "b9627765303356328c409cd59bef43d15f4eafcf"
},

13
src/gallium/drivers/etnaviv/etnaviv_transfer.c
View file

@ -241,6 +241,17 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
assert(level <= prsc->last_level);
/* This one is a little tricky: if we have a separate render resource, which
* is newer than the base resource we want the transfer to target this one,
* to get the most up-to-date content, but only if we don't have a texture
* target of the same age, as transfering in/out of the texture target is
* generally preferred for the reasons listed below */
if (rsc->render && etna_resource_newer(etna_resource(rsc->render), rsc) &&
(!rsc->texture || etna_resource_newer(etna_resource(rsc->render),
etna_resource(rsc->texture)))) {
rsc = etna_resource(rsc->render);
}
if (rsc->texture && !etna_resource_newer(rsc, etna_resource(rsc->texture))) {
/* We have a texture resource which is the same age or newer than the
* render resource. Use the texture resource, which avoids bouncing
@ -303,7 +314,7 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
}
if (!(usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE))
etna_copy_resource_box(pctx, trans->rsc, prsc, level, &ptrans->box);
etna_copy_resource_box(pctx, trans->rsc, &rsc->base, level, &ptrans->box);
/* Switch to using the temporary resource instead */
rsc = etna_resource(trans->rsc);