Zebediah Figura : ddraw: Retrieve the material from the primary stateblock.

Alexandre Julliard julliard at winehq.org
Tue Mar 3 16:24:54 CST 2020


Module: wine
Branch: master
Commit: 955512d2087f22c9e792364f5d5bfd7384655fc3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=955512d2087f22c9e792364f5d5bfd7384655fc3

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Fri Feb 28 14:18:41 2020 -0600

ddraw: Retrieve the material from the primary stateblock.

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

---

 dlls/ddraw/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 7acc8e0db0..fa79a98777 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -5495,7 +5495,7 @@ static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma
 
     wined3d_mutex_lock();
     /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */
-    wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material);
+    memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material));
     wined3d_mutex_unlock();
 
     return D3D_OK;




More information about the wine-cvs mailing list