Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_SetExecuteData().
Alexandre Julliard
julliard at winehq.org
Wed Feb 7 15:24:26 CST 2018
Module: wine
Branch: master
Commit: cbd1aaafa0ff096b037f026a0900337bcb9a45f8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd1aaafa0ff096b037f026a0900337bcb9a45f8
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Feb 7 02:29:30 2018 +0330
ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_SetExecuteData().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/executebuffer.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index 6ce77e3..b1afcf5 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -617,17 +617,25 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer *
{
unsigned int new_size = max(data->dwVertexCount, buffer->vertex_size * 2);
struct wined3d_buffer *src_buffer, *dst_buffer;
+ struct wined3d_buffer_desc desc;
- hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DVERTEX),
- WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_SYSTEM_MEM,
- NULL, &ddraw_null_wined3d_parent_ops, &src_buffer);
- if (FAILED(hr))
+ desc.byte_width = new_size * sizeof(D3DVERTEX);
+ desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY;
+ desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER;
+ desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP;
+ desc.misc_flags = 0;
+ desc.structure_byte_stride = 0;
+
+ if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc,
+ NULL, NULL, &ddraw_null_wined3d_parent_ops, &src_buffer)))
return hr;
- hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DTLVERTEX),
- WINED3DUSAGE_STATICDECL, WINED3D_POOL_DEFAULT,
- NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer);
- if (FAILED(hr))
+ desc.byte_width = new_size * sizeof(D3DTLVERTEX);
+ desc.usage = WINED3DUSAGE_STATICDECL;
+ desc.access = WINED3D_RESOURCE_ACCESS_GPU;
+
+ if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc,
+ NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer)))
{
wined3d_buffer_decref(src_buffer);
return hr;
More information about the wine-cvs
mailing list