From 6e7d370209e628c2a3707ac38f09ff7977e00592 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 26 Aug 2016 13:51:23 +0200 Subject: [PATCH] ddraw: Rename "wineD3DVertexDeclaration" to "wined3d_declaration". Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/vertexbuffer.c | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a908c113e57..7c2f026107d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -553,7 +553,7 @@ struct d3d_vertex_buffer /*** WineD3D and ddraw links ***/ struct wined3d_buffer *wined3d_buffer; - struct wined3d_vertex_declaration *wineD3DVertexDeclaration; + struct wined3d_vertex_declaration *wined3d_declaration; struct ddraw *ddraw; /*** Storage for D3D7 specific things ***/ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a473682a622..09cc5f19231 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4276,7 +4276,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE stride = get_flexible_vertex_size(vb_impl->fvf); 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, 0, vb_impl->wined3d_buffer, 0, stride))) { @@ -4375,7 +4375,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, 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)); if (FAILED(hr)) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 9b86129c73a..a88d5b5508f 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -158,7 +158,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) if (curVB == buffer->wined3d_buffer) 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_mutex_unlock(); @@ -383,7 +383,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_device_set_stream_source(device_impl->wined3d_device, 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, 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; } - buffer->wineD3DVertexDeclaration = ddraw_find_decl(ddraw, desc->dwFVF); - if (!buffer->wineD3DVertexDeclaration) + if (!(buffer->wined3d_declaration = ddraw_find_decl(ddraw, desc->dwFVF))) { ERR("Failed to find vertex declaration for fvf %#x.\n", desc->dwFVF); wined3d_buffer_decref(buffer->wined3d_buffer); hr = DDERR_INVALIDPARAMS; goto end; } - wined3d_vertex_declaration_incref(buffer->wineD3DVertexDeclaration); + wined3d_vertex_declaration_incref(buffer->wined3d_declaration); end: wined3d_mutex_unlock();