wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().

wined3d_buffer_load_location() can handle loading from WINED3D_LOCATION_DISCARDED just fine, so use it instead of duplicating the functionality here. Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().
287bfc77 · Zebediah Figura · Alexandre Julliard · 837e6050 · 287bfc77
Commit 287bfc77 authored Jan 28, 2022 by Zebediah Figura Committed by Alexandre Julliard Jan 28, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

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

No files found.
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -653,14 +653,12 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co
    if (locations & WINED3D_LOCATION_DISCARDED)
    {
        locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM);
-        if (!wined3d_buffer_prepare_location(buffer, context, locations))
+        if (!wined3d_buffer_load_location(buffer, context, locations))
        {
            data->buffer_object = 0;
            data->addr = NULL;
            return 0;
        }
-        wined3d_buffer_validate_location(buffer, locations);
-        wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED);
    }
    if (locations & WINED3D_LOCATION_BUFFER)
    {