Module: Mesa Branch: master Commit: 8ef6f68fa5f0e1e91ff88706e73a8c62463dcf69 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ef6f68fa5f0e1e91ff88706e73a8c62463dcf69
Author: Marek Olšák <[email protected]> Date: Wed Jan 30 20:45:39 2019 -0500 st/mesa: always unmap the uploader in st_atom_array.c This is a no-op for drivers supporting persistent mappings. Reviewed-by: Nicolai Hähnle <[email protected]> Tested-by: Dieter Nützel <[email protected]> --- src/mesa/state_tracker/st_atom_array.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c index 7a63d7504f3..c5e0792cc1d 100644 --- a/src/mesa/state_tracker/st_atom_array.c +++ b/src/mesa/state_tracker/st_atom_array.c @@ -496,17 +496,15 @@ st_setup_current(struct st_context *st, * times (thousands of times), so a better placement is going to * perform better. */ - u_upload_data(st->can_bind_const_buffer_as_vertex ? - st->pipe->const_uploader : - st->pipe->stream_uploader, + struct u_upload_mgr *uploader = st->can_bind_const_buffer_as_vertex ? + st->pipe->const_uploader : + st->pipe->stream_uploader; + u_upload_data(uploader, 0, cursor - data, max_alignment, data, &vbuffer[bufidx].buffer_offset, &vbuffer[bufidx].buffer.resource); - - if (!ctx->Const.AllowMappedBuffersDuringExecution && - !st->can_bind_const_buffer_as_vertex) { - u_upload_unmap(st->pipe->stream_uploader); - } + /* Always unmap. The uploader might use explicit flushes. */ + u_upload_unmap(uploader); } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
