system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-11 21:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wined3d: Remove the useless "changed" and "enabledChanged" fields from struct wined3d_light_info.

Browse source
This commit is contained in:
Henri Verbeet 2009-10-14 10:55:17 +02:00 committed by Alexandre Julliard
parent 3bc9d1894d
commit a24d14796a
3 changed files with 19 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/wined3d/device.c
View file

@ -2485,7 +2485,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I
list_add_head(&This->updateStateBlock->lightMap[Hi], &object->entry);
object->glIndex = -1;
object->OriginalIndex = Index;
object->changed = TRUE;
}
/* Initialize the object */
@ -2636,7 +2635,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D
}
}
lightInfo->enabledChanged = TRUE;
if(!Enable) {
if(lightInfo->glIndex != -1) {
if(!This->isRecordingState) {

52
dlls/wined3d/stateblock.c
View file

@ -447,8 +447,6 @@ static void stateblock_init_lights(IWineD3DStateBlockImpl *stateblock, struct li
struct wined3d_light_info *dst_light = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst_light));
*dst_light = *src_light;
dst_light->changed = TRUE;
dst_light->enabledChanged = TRUE;
list_add_tail(&stateblock->lightMap[i], &dst_light->entry);
}
}
@ -561,42 +559,34 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock
LIST_FOR_EACH(e, &This->lightMap[i]) {
BOOL updated = FALSE;
struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight;
if (!src->changed && !src->enabledChanged) continue;
/* Look up the light in the destination */
LIST_FOR_EACH(f, &targetStateBlock->lightMap[i]) {
realLight = LIST_ENTRY(f, struct wined3d_light_info, entry);
if(realLight->OriginalIndex == src->OriginalIndex) {
if(src->changed) {
src->OriginalParms = realLight->OriginalParms;
if (realLight->OriginalIndex == src->OriginalIndex)
{
src->OriginalParms = realLight->OriginalParms;
if (realLight->glIndex == -1 && src->glIndex != -1)
{
/* Light disabled */
This->activeLights[src->glIndex] = NULL;
}
if(src->enabledChanged) {
/* Need to double check because enabledChanged does not catch enabled -> disabled -> enabled
* or disabled -> enabled -> disabled changes
*/
if(realLight->glIndex == -1 && src->glIndex != -1) {
/* Light disabled */
This->activeLights[src->glIndex] = NULL;
} else if(realLight->glIndex != -1 && src->glIndex == -1){
/* Light enabled */
This->activeLights[realLight->glIndex] = src;
}
src->glIndex = realLight->glIndex;
else if (realLight->glIndex != -1 && src->glIndex == -1)
{
/* Light enabled */
This->activeLights[realLight->glIndex] = src;
}
src->glIndex = realLight->glIndex;
updated = TRUE;
break;
}
}
if(updated) {
/* Found a light, all done, proceed with next hash entry */
continue;
} else if(src->changed) {
/* Otherwise assign defaul params */
src->OriginalParms = WINED3D_default_light;
} else {
/* Not enabled by default */
src->glIndex = -1;
if (!updated)
{
ERR("Light %u in stateblock %p does not exist in device stateblock %p.\n",
src->OriginalIndex, This, targetStateBlock);
}
}
}
@ -987,12 +977,8 @@ static void apply_lights(IWineD3DDevice *pDevice, const IWineD3DStateBlockImpl *
{
const struct wined3d_light_info *light = LIST_ENTRY(e, struct wined3d_light_info, entry);
if(light->changed) {
IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms);
}
if(light->enabledChanged) {
IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1);
}
IWineD3DDevice_SetLight(pDevice, light->OriginalIndex, &light->OriginalParms);
IWineD3DDevice_SetLightEnable(pDevice, light->OriginalIndex, light->glIndex != -1);
}
}
}

2
dlls/wined3d/wined3d_private.h
View file

@ -1208,8 +1208,6 @@ struct wined3d_light_info
WINED3DLIGHT OriginalParms; /* Note D3D8LIGHT == D3D9LIGHT */
DWORD OriginalIndex;
LONG glIndex;
BOOL changed;
BOOL enabledChanged;
BOOL enabled;
/* Converted parms to speed up swapping lights */