d3d8: Pass NOOVERWRITE to redundantly discarded maps.

If DISCARD maps are accelerated, passing empty map flags won't return the same accelerated BO. Tested with Port Royale 2 and Rayman 3. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55770

d3d8: Pass NOOVERWRITE to redundantly discarded maps.
e49c19eb · Zebediah Figura · Alexandre Julliard · 00e1eaff · e49c19eb
Commit e49c19eb authored Nov 10, 2023 by Zebediah Figura Committed by Alexandre Julliard Nov 16, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

buffer.c dlls/d3d8/buffer.c +8 -2

No files found.
--- a/dlls/d3d8/buffer.c
+++ b/dlls/d3d8/buffer.c
@@ -193,7 +193,10 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT
            iface, offset, size, data, flags);

    if (buffer->discarded)
-        flags &= ~D3DLOCK_DISCARD;
+    {
+        WARN("Filtering out redundant discard of %p.\n", buffer);
+        flags = (flags & ~D3DLOCK_DISCARD) | D3DLOCK_NOOVERWRITE;
+    }
    if (flags & D3DLOCK_DISCARD)
        buffer->discarded = true;

@@ -514,7 +517,10 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o
            iface, offset, size, data, flags);

    if (buffer->discarded)
-        flags &= ~D3DLOCK_DISCARD;
+    {
+        WARN("Filtering out redundant discard of %p.\n", buffer);
+        flags = (flags & ~D3DLOCK_DISCARD) | D3DLOCK_NOOVERWRITE;
+    }
    if (flags & D3DLOCK_DISCARD)
        buffer->discarded = true;