Zebediah Figura : d3d9: Retrieve the material from the primary stateblock.
Alexandre Julliard
julliard at winehq.org
Tue Feb 18 16:13:46 CST 2020
Module: wine
Branch: master
Commit: 85b6123c81719b4cd3c9bd41016a059709a213f9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b6123c81719b4cd3c9bd41016a059709a213f9
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Feb 17 17:19:50 2020 -0600
d3d9: 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/d3d9/device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 447aa26844..802a974f34 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2208,7 +2208,7 @@ static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATE
/* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */
wined3d_mutex_lock();
- 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