ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Rename "wineD3DVertexDeclaration" to "wined3d_declaration". 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-08-26 13:51:23 +02:00 committed by Alexandre Julliard
parent d2b782f4e4
commit 6e7d370209
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/ddraw_private.h
View File

@ -553,7 +553,7 @@ struct d3d_vertex_buffer
/*** WineD3D and ddraw links ***/ /*** WineD3D and ddraw links ***/
struct wined3d_buffer *wined3d_buffer; struct wined3d_buffer *wined3d_buffer;
struct wined3d_vertex_declaration *wineD3DVertexDeclaration; struct wined3d_vertex_declaration *wined3d_declaration;
struct ddraw *ddraw; struct ddraw *ddraw;
/*** Storage for D3D7 specific things ***/ /*** Storage for D3D7 specific things ***/

4
dlls/ddraw/device.c
View File

@ -4276,7 +4276,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE
stride = get_flexible_vertex_size(vb_impl->fvf); stride = get_flexible_vertex_size(vb_impl->fvf);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration);
if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device,
0, vb_impl->wined3d_buffer, 0, stride))) 0, vb_impl->wined3d_buffer, 0, stride)))
{ {
@ -4375,7 +4375,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration);
hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD));
if (FAILED(hr)) if (FAILED(hr))

9
dlls/ddraw/vertexbuffer.c
View File

@ -158,7 +158,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface)
if (curVB == buffer->wined3d_buffer) if (curVB == buffer->wined3d_buffer)
wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0);
wined3d_vertex_declaration_decref(buffer->wineD3DVertexDeclaration); wined3d_vertex_declaration_decref(buffer->wined3d_declaration);
wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_buffer_decref(buffer->wined3d_buffer);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
@ -383,7 +383,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7
wined3d_device_set_stream_source(device_impl->wined3d_device, wined3d_device_set_stream_source(device_impl->wined3d_device,
0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); 0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf));
wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wineD3DVertexDeclaration); wined3d_device_set_vertex_declaration(device_impl->wined3d_device, src_buffer_impl->wined3d_declaration);
hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx, hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx,
count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf); count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf);
@ -603,15 +603,14 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf,
goto end; goto end;
} }
buffer->wineD3DVertexDeclaration = ddraw_find_decl(ddraw, desc->dwFVF); if (!(buffer->wined3d_declaration = ddraw_find_decl(ddraw, desc->dwFVF)))
if (!buffer->wineD3DVertexDeclaration)
{ {
ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF);
wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_buffer_decref(buffer->wined3d_buffer);
hr = DDERR_INVALIDPARAMS; hr = DDERR_INVALIDPARAMS;
goto end; goto end;
} }
wined3d_vertex_declaration_incref(buffer->wineD3DVertexDeclaration); wined3d_vertex_declaration_incref(buffer->wined3d_declaration);
end: end:
wined3d_mutex_unlock(); wined3d_mutex_unlock();