Module: wine Branch: master Commit: 6fd212818d6ade9d571aba1566b5e56ce594b01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd212818d6ade9d571aba1566...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Jan 31 15:47:14 2017 +0100
wined3d: Do not preload the buffer in wined3d_buffer_unmap().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/buffer.c | 6 +----- dlls/wined3d/context.c | 6 +++++- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1fdf0a3..de5ab17 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -879,7 +879,7 @@ drop_query: This->flags &= ~WINED3D_BUFFER_APPLESYNC; }
-void buffer_mark_used(struct wined3d_buffer *buffer) +static void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_DISCARD; } @@ -1188,10 +1188,6 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) buffer_clear_dirty_areas(buffer); buffer->map_ptr = NULL; } - else if (buffer->flags & WINED3D_BUFFER_HASDESC) - { - wined3d_resource_preload(&buffer->resource); - } }
HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cd0057e..fdf684e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3505,8 +3505,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) { if (map & 1) - buffer_mark_used(state->streams[context->stream_info.elements[i].stream_idx].buffer); + wined3d_buffer_load(state->streams[context->stream_info.elements[i].stream_idx].buffer, + context, state); } + /* Loading the buffers above may have invalidated the stream info. */ + if (isStateDirty(context, STATE_STREAMSRC)) + context_update_stream_info(context, state); } if (state->index_buffer) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1cae2fe..9c32f2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3239,7 +3239,6 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); }
-void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN;