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

wined3d: Fix light state bugs.

This commit is contained in:
Ivan Gyurdiev 2006-07-13 18:17:55 -06:00 committed by Alexandre Julliard
parent 31f640274f
commit 07eb6531a3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/wined3d/device.c
View File

@ -2832,6 +2832,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
TRACE("(%p) : Idx(%ld), enable? %d\n", This, Index, Enable); TRACE("(%p) : Idx(%ld), enable? %d\n", This, Index, Enable);
/* Tests show true = 128...not clear why */
Enable = Enable? 128: 0;
/* If recording state block, just add to end of lights chain with changedEnable set to true */ /* If recording state block, just add to end of lights chain with changedEnable set to true */
if (This->isRecordingState) { if (This->isRecordingState) {
lightInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PLIGHTINFOEL)); lightInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PLIGHTINFOEL));
@ -2841,6 +2845,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D
lightInfo->OriginalIndex = Index; lightInfo->OriginalIndex = Index;
lightInfo->glIndex = -1; lightInfo->glIndex = -1;
lightInfo->enabledChanged = TRUE; lightInfo->enabledChanged = TRUE;
lightInfo->lightEnabled = Enable;
/* Add to the END of the chain of lights changes to be replayed */ /* Add to the END of the chain of lights changes to be replayed */
if (This->updateStateBlock->lights == NULL) { if (This->updateStateBlock->lights == NULL) {
@ -2887,7 +2892,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D
} else { } else {
TRACE("Nothing to do as light was not enabled\n"); TRACE("Nothing to do as light was not enabled\n");
} }
lightInfo->lightEnabled = FALSE; lightInfo->lightEnabled = Enable;
} else { } else {
/* We are enabling it. If it is enabled, it's really simple */ /* We are enabling it. If it is enabled, it's really simple */
@ -2898,7 +2903,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D
/* If it already has a glIndex, it's still simple */ /* If it already has a glIndex, it's still simple */
} else if (lightInfo->glIndex != -1) { } else if (lightInfo->glIndex != -1) {
TRACE("Reusing light as already set up at gl idx %ld\n", lightInfo->glIndex); TRACE("Reusing light as already set up at gl idx %ld\n", lightInfo->glIndex);
lightInfo->lightEnabled = TRUE; lightInfo->lightEnabled = Enable;
ENTER_GL(); ENTER_GL();
glEnable(GL_LIGHT0 + lightInfo->glIndex); glEnable(GL_LIGHT0 + lightInfo->glIndex);
checkGLcall("glEnable GL_LIGHT0+Index already setup"); checkGLcall("glEnable GL_LIGHT0+Index already setup");
@ -2969,7 +2974,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D
glIndex = bsf->glIndex; glIndex = bsf->glIndex;
bsf->glIndex = -1; bsf->glIndex = -1;
lightInfo->glIndex = glIndex; lightInfo->glIndex = glIndex;
lightInfo->lightEnabled = TRUE; lightInfo->lightEnabled = Enable;
/* Finally set up the light in gl itself */ /* Finally set up the light in gl itself */
TRACE("Replacing light which was set up at gl idx %ld\n", lightInfo->glIndex); TRACE("Replacing light which was set up at gl idx %ld\n", lightInfo->glIndex);
@ -2987,7 +2992,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D
know the index of the next one! */ know the index of the next one! */
glIndex = Index; glIndex = Index;
lightInfo->glIndex = glIndex; lightInfo->glIndex = glIndex;
lightInfo->lightEnabled = TRUE; lightInfo->lightEnabled = Enable;
/* In an ideal world, it's already in the right place */ /* In an ideal world, it's already in the right place */
if (lightInfo->prev == NULL || lightInfo->prev->glIndex!=-1) { if (lightInfo->prev == NULL || lightInfo->prev->glIndex!=-1) {