system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 05:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d9: Use wined3d_buffer_create() in vertexbuffer_init().

Browse source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-02-08 02:40:50 +03:30 committed by Alexandre Julliard
parent 74490bd9c6
commit 6187de0143
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/d3d9/buffer.c
View file

@ -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))
{