[PATCH 1/2] ddraw: Use system memory for version 4 vertex buffers.

[Zebediah Figura]

From: Zebediah Figura

This improves performance in Prince of Persia 3D.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44863
---
 dlls/ddraw/ddraw_private.h | 1 +
 dlls/ddraw/device.c        | 4 ++--
 dlls/ddraw/vertexbuffer.c  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index e3fac63a38f..c65d502a1dc 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -598,6 +598,7 @@ struct d3d_vertex_buffer
     DWORD                size;
     BOOL                 dynamic;
     bool discarded;
+    bool sysmem;
 };

HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw,
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 1cfef5007d5..28b9c77c0d2 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -4119,7 +4119,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE

stride = get_flexible_vertex_size(vb_impl->fvf);

-    if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY)
+    if (vb_impl->sysmem)
     {
         TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawPrimitive().\n");
         wined3d_mutex_lock();
@@ -4237,7 +4237,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,

vb_impl->discarded = false;

-    if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY)
+    if (vb_impl->sysmem)
     {
         TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n");
         wined3d_mutex_lock();
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index 56a4c3e93e4..a75a3a15682 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -115,7 +115,7 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer
     if (dynamic)
         desc.usage |= WINED3DUSAGE_DYNAMIC;
     desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER;
-    if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY)
+    if (buffer->sysmem)
         desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
     else
         desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
@@ -460,6 +460,7 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf,
     buffer->Caps = desc->dwCaps;
     buffer->fvf = desc->dwFVF;
     buffer->size = get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices;
+    buffer->sysmem = ((buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) || buffer->version < 7);

wined3d_mutex_lock();