wined3d: Evict system memory for dynamic buffers on the first WINED3D_MAP_DISCARD map.

Mostly to avoid making things worse for applications that map dynamic buffers without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Evict system memory for dynamic buffers on the first WINED3D_MAP_DISCARD map.
efdb898b · Henri Verbeet · Alexandre Julliard · a5f7aff3 · efdb898b
Commit efdb898b authored Jan 30, 2017 by Henri Verbeet Committed by Alexandre Julliard Jan 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

buffer.c dlls/wined3d/buffer.c +5 -1

No files found.
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -994,8 +994,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *
    }
    wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER);

-    if (buffer->resource.heap_memory)
+    if (buffer->resource.heap_memory && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC))
        wined3d_buffer_evict_sysmem(buffer);
+
 }

 struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)
@@ -1055,6 +1056,9 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI
            if (!(flags & WINED3D_MAP_READONLY))
                buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size);

+            if ((flags & WINED3D_MAP_DISCARD) && buffer->resource.heap_memory)
+                wined3d_buffer_evict_sysmem(buffer);
+
            if (count == 1)
            {
                const struct wined3d_gl_info *gl_info;