wined3d: Respect the client map count even for suballocated BOs.

I believe this was a mistake introduced by 831ff102. This fixes GL errors with multiple applications, including Ragnarok Online and Bloodrayne: Terminal Cut.

wined3d: Respect the client map count even for suballocated BOs.
93b8b637 · Zebediah Figura · Alexandre Julliard · 24ff5c2f · 93b8b637
Commit 93b8b637 authored Jul 10, 2022 by Zebediah Figura Committed by Alexandre Julliard Jul 14, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 9 deletions

context_gl.c dlls/wined3d/context_gl.c +8 -9

No files found.
--- a/dlls/wined3d/context_gl.c
+++ b/dlls/wined3d/context_gl.c
@@ -2944,15 +2944,6 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context
        return;
    }

-    if (bo->memory)
-    {
-        struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk);
-
-        wined3d_allocator_chunk_gl_unmap(chunk_gl, context_gl);
-        bo->b.map_ptr = NULL;
-        return;
-    }
-
    wined3d_device_bo_map_lock(context_gl->c.device);
    /* The mapping is still in use by the client (viz. for an accelerated
     * NOOVERWRITE map). The client will trigger another unmap request when the
@@ -2967,6 +2958,14 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context
    bo->b.map_ptr = NULL;
    wined3d_device_bo_map_unlock(context_gl->c.device);

+    if (bo->memory)
+    {
+        struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk);
+
+        wined3d_allocator_chunk_gl_unmap(chunk_gl, context_gl);
+        return;
+    }
+
    wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id);
    GL_EXTCALL(glUnmapBuffer(bo->binding));
    wined3d_context_gl_bind_bo(context_gl, bo->binding, 0);