ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Always activate the light when requested replacing some previous light. 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2019-06-11 13:06:20 +03:00 committed by Alexandre Julliard
parent d864cece53
commit 1eb6d8c58d
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/light.c
View File

@ -62,8 +62,6 @@ void light_activate(struct d3d_light *light)
if (light->light.dwFlags & D3DLIGHT_ACTIVE)
{
viewport_alloc_active_light_index(light);
if (!light->active_light_index)
return;
light_update(light);
IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->active_light_index, TRUE);
}

20
dlls/ddraw/viewport.c
View File

@ -135,9 +135,25 @@ void viewport_alloc_active_light_index(struct d3d_light *light)
return;
if (vp->active_lights_count >= DDRAW_MAX_ACTIVE_LIGHTS)
return;
{
struct d3d_light *l;
LIST_FOR_EACH_ENTRY(l, &vp->light_list, struct d3d_light, entry)
{
if (l->active_light_index)
{
WARN("Too many active lights, viewport %p, light %p, deactivating %p.\n", vp, light, l);
light_deactivate(l);
/* Recycle active lights in a FIFO way. */
list_remove(&light->entry);
list_add_tail(&vp->light_list, &light->entry);
break;
}
}
}
map = vp->map_lights;
assert(vp->active_lights_count < DDRAW_MAX_ACTIVE_LIGHTS && map != ~0u);
i = 0;
while (map & 1)
@ -817,7 +833,7 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *viewport, IDirec
light_impl->active_viewport = vp;
/* Add the light in the 'linked' chain */
list_add_head(&vp->light_list, &light_impl->entry);
list_add_tail(&vp->light_list, &light_impl->entry);
IDirect3DLight_AddRef(light);
light_activate(light_impl);