From c50d3468ccf7705d83daca368f9ab0bf944c211e Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 6 Feb 2020 19:33:26 -0600 Subject: [PATCH] d3d9: Retrieve the vertex declaration from the primary stateblock. Signed-off-by: Zebediah Figura Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3609dddb39b..789f5a9c18f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3338,7 +3338,7 @@ static HRESULT WINAPI d3d9_device_GetVertexDeclaration(IDirect3DDevice9Ex *iface if (!declaration) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + if ((wined3d_declaration = wined3d_stateblock_get_state(device->state)->vertex_declaration)) { declaration_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); *declaration = &declaration_impl->IDirect3DVertexDeclaration9_iface; @@ -3460,7 +3460,7 @@ static HRESULT WINAPI d3d9_device_GetFVF(IDirect3DDevice9Ex *iface, DWORD *fvf) TRACE("iface %p, fvf %p.\n", iface, fvf); wined3d_mutex_lock(); - if ((wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + if ((wined3d_declaration = wined3d_stateblock_get_state(device->state)->vertex_declaration)) { d3d9_declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); *fvf = d3d9_declaration->fvf;