[PATCH 4/5] d3d9: Use wined3d_buffer_create() in vertexbuffer_init().
Henri Verbeet
hverbeet at codeweavers.com
Wed Feb 7 17:10:50 CST 2018
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d9/buffer.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c
index 795164c..30e86f8 100644
--- a/dlls/d3d9/buffer.c
+++ b/dlls/d3d9/buffer.c
@@ -274,25 +274,29 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops =
HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device,
UINT size, UINT usage, DWORD fvf, D3DPOOL pool)
{
- enum wined3d_pool wined3d_pool;
- DWORD wined3d_usage;
+ struct wined3d_buffer_desc desc;
HRESULT hr;
- wined3d_pool = pool;
- wined3d_usage = usage & WINED3DUSAGE_MASK;
if (pool == D3DPOOL_SCRATCH)
{
- wined3d_pool = WINED3D_POOL_SYSTEM_MEM;
- wined3d_usage |= WINED3DUSAGE_SCRATCH;
+ WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n");
+ return D3DERR_INVALIDCALL;
}
buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl;
buffer->fvf = fvf;
d3d9_resource_init(&buffer->resource);
+ desc.byte_width = size;
+ desc.usage = usage & WINED3DUSAGE_MASK;
+ desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER;
+ desc.access = wined3daccess_from_d3dpool(pool);
+ desc.misc_flags = 0;
+ desc.structure_byte_stride = 0;
+
wined3d_mutex_lock();
- hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool,
- buffer, &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer);
+ hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer,
+ &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer);
wined3d_mutex_unlock();
if (FAILED(hr))
{
--
2.1.4
More information about the wine-devel
mailing list