fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "gallium/u_upload_mgr: allow use of FLUSH_EXPLICIT with persistent mappings"

Browse source 
It's no longer needed after radeonsi had its SDMA uploads removed.

This reverts commit 54f7545cd7.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8298>
This commit is contained in:
Marek Olšák 2020-12-21 01:27:44 -05:00 • committed by Marge Bot
parent 8be936f295
commit 0aa63c31ca
2 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gallium/auxiliary/util/u_upload_mgr.c
View file

@ -54,7 +54,6 @@ struct u_upload_mgr {
unsigned buffer_size; /* Same as buffer->width0. */
unsigned offset; /* Aligned offset to the upload buffer, pointing
* at the first unused byte. */
unsigned flushed_size; /* Size we have flushed by transfer_flush_region. */
};
@ -109,21 +108,10 @@ u_upload_clone(struct pipe_context *pipe, struct u_upload_mgr *upload)
upload->flags);
if (!upload->map_persistent && result->map_persistent)
u_upload_disable_persistent(result);
else if (upload->map_persistent &&
upload->map_flags & PIPE_MAP_FLUSH_EXPLICIT)
u_upload_enable_flush_explicit(result);
return result;
}
void
u_upload_enable_flush_explicit(struct u_upload_mgr *upload)
{
assert(upload->map_persistent);
upload->map_flags &= ~PIPE_MAP_COHERENT;
upload->map_flags |= PIPE_MAP_FLUSH_EXPLICIT;
}
void
u_upload_disable_persistent(struct u_upload_mgr *upload)
{
@ -135,27 +123,19 @@ u_upload_disable_persistent(struct u_upload_mgr *upload)
static void
upload_unmap_internal(struct u_upload_mgr *upload, boolean destroying)
{
if (!upload->transfer)
if ((!destroying && upload->map_persistent) || !upload->transfer)
return;
if (upload->map_flags & PIPE_MAP_FLUSH_EXPLICIT) {
struct pipe_box *box = &upload->transfer->box;
unsigned flush_offset = box->x + upload->flushed_size;
struct pipe_box *box = &upload->transfer->box;
if (upload->offset > flush_offset) {
pipe_buffer_flush_mapped_range(upload->pipe, upload->transfer,
flush_offset,
upload->offset - flush_offset);
upload->flushed_size = upload->offset;
}
if (!upload->map_persistent && (int) upload->offset > box->x) {
pipe_buffer_flush_mapped_range(upload->pipe, upload->transfer,
box->x, upload->offset - box->x);
}
if (destroying || !upload->map_persistent) {
pipe_transfer_unmap(upload->pipe, upload->transfer);
upload->transfer = NULL;
upload->map = NULL;
upload->flushed_size = 0;
}
pipe_transfer_unmap(upload->pipe, upload->transfer);
upload->transfer = NULL;
upload->map = NULL;
}

4
src/gallium/auxiliary/util/u_upload_mgr.h
View file

@ -69,10 +69,6 @@ u_upload_create_default(struct pipe_context *pipe);
struct u_upload_mgr *
u_upload_clone(struct pipe_context *pipe, struct u_upload_mgr *upload);
/** Whether to use FLUSH_EXPLICIT with persistent mappings. */
void
u_upload_enable_flush_explicit(struct u_upload_mgr *upload);
/** Whether to avoid persistent mappings where available */
void
u_upload_disable_persistent(struct u_upload_mgr *upload);