Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute().
Alexandre Julliard
julliard at winehq.org
Tue Feb 6 15:55:49 CST 2018
Module: wine
Branch: master
Commit: a3ca7a308afc886af916e459d2a66b9936c2ee7f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ca7a308afc886af916e459d2a66b9936c2ee7f
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Feb 6 03:22:15 2018 +0330
ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/executebuffer.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index ea5a55c..6ce77e3 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -124,13 +124,19 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
if (buffer->index_size < index_count)
{
- struct wined3d_buffer *new_buffer;
unsigned int new_size = max(buffer->index_size * 2, index_count);
+ struct wined3d_buffer *new_buffer;
+ struct wined3d_buffer_desc desc;
+
+ desc.byte_width = new_size * sizeof(*indices);
+ desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL;
+ desc.bind_flags = WINED3D_BIND_INDEX_BUFFER;
+ desc.access = WINED3D_RESOURCE_ACCESS_GPU;
+ desc.misc_flags = 0;
+ desc.structure_byte_stride = 0;
- hr = wined3d_buffer_create_ib(device->wined3d_device, new_size * sizeof(*indices),
- WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT,
- NULL, &ddraw_null_wined3d_parent_ops, &new_buffer);
- if (FAILED(hr))
+ if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc,
+ NULL, NULL, &ddraw_null_wined3d_parent_ops, &new_buffer)))
return hr;
buffer->index_size = new_size;
More information about the wine-cvs
mailing list