wined3d: Validate WINED3D_LOCATION_BUFFER on WINED3D_MAP_DISCARD buffer maps.

Usually when doing a WINED3D_MAP_DISCARD map on a buffer with a buffer object WINED3D_LOCATION_BUFFER will already be current. However, if the previous map on that buffer loaded WINED3D_LOCATION_SYSMEM, that's not necessarily true. This also brings the code further in line with the corresponding code for textures. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Validate WINED3D_LOCATION_BUFFER on WINED3D_MAP_DISCARD buffer maps.
4aea3618 · Henri Verbeet · Alexandre Julliard · 67007e01 · 4aea3618
Commit 4aea3618 authored Feb 23, 2017 by Henri Verbeet Committed by Alexandre Julliard Feb 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1054,7 +1054,9 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI
            context = context_acquire(device, NULL, 0);
            gl_info = context->gl_info;

-            if (!(flags & WINED3D_MAP_DISCARD))
+            if (flags & WINED3D_MAP_DISCARD)
+                wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER);
+            else
                wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER);

            if (!(flags & WINED3D_MAP_READONLY))