Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer().
Alexandre Julliard
julliard at winehq.org
Thu Feb 8 15:33:07 CST 2018
Module: wine
Branch: master
Commit: 0b92a6fba7a6e60c6ff1a3729a3b21019c2df0ce
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b92a6fba7a6e60c6ff1a3729a3b21019c2df0ce
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Feb 8 02:58:47 2018 +0330
ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/vertexbuffer.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index 6a9544b..df8531d 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -115,22 +115,24 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface)
static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer *buffer, BOOL dynamic,
struct wined3d_buffer **wined3d_buffer)
{
- DWORD usage = WINED3DUSAGE_STATICDECL;
- enum wined3d_pool pool;
-
- if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY)
- pool = WINED3D_POOL_SYSTEM_MEM;
- else
- pool = WINED3D_POOL_DEFAULT;
+ struct wined3d_buffer_desc desc;
+ desc.byte_width = buffer->size;
+ desc.usage = WINED3DUSAGE_STATICDECL;
if (buffer->Caps & D3DVBCAPS_WRITEONLY)
- usage |= WINED3DUSAGE_WRITEONLY;
+ desc.usage |= WINED3DUSAGE_WRITEONLY;
if (dynamic)
- usage |= WINED3DUSAGE_DYNAMIC;
+ desc.usage |= WINED3DUSAGE_DYNAMIC;
+ desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER;
+ if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY)
+ desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP;
+ else
+ desc.access = WINED3D_RESOURCE_ACCESS_GPU;
+ desc.misc_flags = 0;
+ desc.structure_byte_stride = 0;
- return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device,
- buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops,
- wined3d_buffer);
+ return wined3d_buffer_create(buffer->ddraw->wined3d_device, &desc,
+ NULL, buffer, &ddraw_null_wined3d_parent_ops, wined3d_buffer);
}
/*****************************************************************************
More information about the wine-cvs
mailing list