Skip to content

W
wine-cw
Commit b41a3ad2 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard
Browse files
Options

ddraw: Make sure AddLight properly activates lights.

parent ca7e56cf
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
dlls/ddraw/viewport.c
View file @ b41a3ad2
...@@ -672,8 +672,8 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, ...@@ -672,8 +672,8 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface,
This->background->mat.u.diffuse.u4.a); This->background->mat.u.diffuse.u4.a);
} }
/* Need to temporarily activate viewport to clear it. Previously active one will be restored /* Need to temporarily activate the viewport to clear it. The previously
afterwards. */ * active one will be restored afterwards. */
viewport_activate(This, TRUE); viewport_activate(This, TRUE);
hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects, hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects,
...@@ -740,8 +740,12 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D ...@@ -740,8 +740,12 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D
light_impl->active_viewport = This; light_impl->active_viewport = This;
/* If active, activate the light */ /* If active, activate the light */
if (This->active_device) if (This->active_device && light_impl->light.dwFlags & D3DLIGHT_ACTIVE)
{
/* Disable the flag so that light_activate actually does its job. */
light_impl->light.dwFlags &= ~D3DLIGHT_ACTIVE;
light_activate(light_impl); light_activate(light_impl);
}
wined3d_mutex_unlock(); wined3d_mutex_unlock();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment