d3d9: Retrieve the vertex declaration from the primary stateblock.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d9: Retrieve the vertex declaration from the primary stateblock.
c50d3468 · Zebediah Figura · Alexandre Julliard · c9959adc · c50d3468
Commit c50d3468 authored Feb 06, 2020 by Zebediah Figura Committed by Alexandre Julliard Feb 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

device.c dlls/d3d9/device.c +2 -2

No files found.
--- 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;