marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Retrieve light state 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>
feature/deterministic
Zebediah Figura 2020-02-25 17:35:06 -06:00 committed by Alexandre Julliard
parent 7e0e1859d1
commit f7d744e9c5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3d8/device.c
View File

@ -1764,13 +1764,14 @@ static HRESULT WINAPI d3d8_device_SetLight(IDirect3DDevice8 *iface, DWORD index,
static HRESULT WINAPI d3d8_device_GetLight(IDirect3DDevice8 *iface, DWORD index, D3DLIGHT8 *light)
{
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
BOOL enabled;
HRESULT hr;
TRACE("iface %p, index %u, light %p.\n", iface, index, light);
/* Note: D3DLIGHT8 is compatible with struct wined3d_light. */
wined3d_mutex_lock();
hr = wined3d_device_get_light(device->wined3d_device, index, (struct wined3d_light *)light);
hr = wined3d_stateblock_get_light(device->state, index, (struct wined3d_light *)light, &enabled);
wined3d_mutex_unlock();
return hr;
@ -1792,15 +1793,16 @@ static HRESULT WINAPI d3d8_device_LightEnable(IDirect3DDevice8 *iface, DWORD ind
return hr;
}
static HRESULT WINAPI d3d8_device_GetLightEnable(IDirect3DDevice8 *iface, DWORD index, BOOL *enable)
static HRESULT WINAPI d3d8_device_GetLightEnable(IDirect3DDevice8 *iface, DWORD index, BOOL *enabled)
{
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
struct wined3d_light light;
HRESULT hr;
TRACE("iface %p, index %u, enable %p.\n", iface, index, enable);
TRACE("iface %p, index %u, enabled %p.\n", iface, index, enabled);
wined3d_mutex_lock();
hr = wined3d_device_get_light_enable(device->wined3d_device, index, enable);
hr = wined3d_stateblock_get_light(device->state, index, &light, enabled);
wined3d_mutex_unlock();
return hr;