Commit d9e8f4b4 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wined3d: Call wined3d_context_unmap_bo_address() when updating a buffer BO.

That is, don't just flush it, but unmap it as well. As of d8e8ab21, we can get here even when !wined3d_map_persistent(). Thus we currently end up leaving BOs mapped when performing an accelerated DISCARD map. Try to avoid that. Signed-off-by: 's avatarZebediah Figura <zfigura@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 28285f1e
...@@ -1156,9 +1156,27 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi ...@@ -1156,9 +1156,27 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi
} }
if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == buffer->buffer_object) if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == buffer->buffer_object)
wined3d_context_flush_bo_address(context, &upload_bo->addr, size); {
struct wined3d_range range;
/* We need to flush changes, which is implicitly done by
* wined3d_context_unmap_bo_address() even if we aren't actually going
* to unmap.
*
* We would also like to free up virtual address space used by this BO
* if it's at a premium—note that this BO was allocated for an
* accelerated map. Hence we unmap the BO instead of merely flushing it;
* if we don't care about unmapping BOs then
* wined3d_context_unmap_bo_address() will flush and return.
*/
range.offset = offset;
range.size = size;
wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 1, &range);
}
else else
{
wined3d_buffer_copy_bo_address(buffer, context, offset, &upload_bo->addr, size); wined3d_buffer_copy_bo_address(buffer, context, offset, &upload_bo->addr, size);
}
} }
static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, static void wined3d_buffer_init_data(struct wined3d_buffer *buffer,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment