fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 15:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno: Remove broken back_blit optimization.

Browse source 
It wasn't checking that the transfer map would definitely overwrite all of
the data being initialized by the back blit, and if we knew that it
would then the caller would have provided PIPE_MAP_DISCARD_WHOLE_RESOURCE.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11439>
This commit is contained in:
Emma Anholt 2021-06-15 12:53:34 -07:00
parent 09e1fb2bce
commit 2a9225d05f
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/freedreno/freedreno_resource.c
View file

@ -833,18 +833,6 @@ resource_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
if (usage & PIPE_MAP_DISCARD_WHOLE_RESOURCE) {
invalidate_resource(rsc, usage);
} else {
struct fd_batch *write_batch = NULL;
/* hold a reference, so it doesn't disappear under us: */
fd_screen_lock(ctx->screen);
fd_batch_reference_locked(&write_batch, rsc->track->write_batch);
fd_screen_unlock(ctx->screen);
if ((usage & PIPE_MAP_WRITE) && write_batch && write_batch->back_blit) {
/* if only thing pending is a back-blit, we can discard it: */
fd_batch_reset(write_batch);
}
unsigned op = translate_usage(usage);
bool needs_flush = pending(rsc, !!(usage & PIPE_MAP_WRITE));
@ -896,8 +884,6 @@ resource_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
trans->staging_box.z = 0;
buf = fd_bo_map(staging_rsc->bo);
fd_batch_reference(&write_batch, NULL);
ctx->stats.staging_uploads++;
return buf;
@ -910,8 +896,6 @@ resource_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
needs_flush = false;
}
fd_batch_reference(&write_batch, NULL);
/* The GPU keeps track of how the various bo's are being used, and
* will wait if necessary for the proper operation to have
* completed.