ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed deferred texture state bugs and Panzer works again.

This commit is contained in:
blueshogun96 2010-06-17 07:07:34 +00:00
parent 33ba592146
commit 176ce4fe96
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CxbxKrnl/EmuD3D8/State.cpp
View File

@ -173,7 +173,7 @@ void XTL::EmuUpdateDeferredStates()
if(pCur[0+Adjust2] == 5)
CxbxKrnlCleanup("ClampToEdge is unsupported (temporarily)");
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_ADDRESSU, pCur[0]);
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_ADDRESSU, pCur[0+Adjust2]);
}
if(pCur[1+Adjust2] != X_D3DTSS_UNK)
@ -181,7 +181,7 @@ void XTL::EmuUpdateDeferredStates()
if(pCur[1+Adjust2] == 5)
CxbxKrnlCleanup("ClampToEdge is unsupported (temporarily)");
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_ADDRESSV, pCur[1]);
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_ADDRESSV, pCur[1+Adjust2]);
}
if(pCur[2+Adjust2] != X_D3DTSS_UNK)
@ -189,7 +189,7 @@ void XTL::EmuUpdateDeferredStates()
if(pCur[2+Adjust2] == 5)
CxbxKrnlCleanup("ClampToEdge is unsupported (temporarily)");
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_ADDRESSW, pCur[2]);
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_ADDRESSW, pCur[2+Adjust2]);
}
if(pCur[3+Adjust2] != X_D3DTSS_UNK)
@ -253,7 +253,7 @@ void XTL::EmuUpdateDeferredStates()
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_COLORARG1, pCur[14-Adjust1]);
if(pCur[15-Adjust1] != X_D3DTSS_UNK)
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_COLORARG2, pCur[15]);
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_COLORARG2, pCur[15-Adjust1]);
// TODO: Use a lookup table, this is not always a 1:1 map (same as D3DTSS_COLOROP)
if(pCur[16-Adjust1] != X_D3DTSS_UNK)
@ -286,8 +286,8 @@ void XTL::EmuUpdateDeferredStates()
if(pCur[21-Adjust1] != X_D3DTSS_UNK)
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_TEXTURETRANSFORMFLAGS, pCur[21-Adjust1]);
if(pCur[29] != X_D3DTSS_UNK)
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_BORDERCOLOR, pCur[29]);
/*if(pCur[29] != X_D3DTSS_UNK) // This is NOT a deferred texture state!
g_pD3DDevice8->SetTextureStageState(v, D3DTSS_BORDERCOLOR, pCur[29]);*/
/** To check for unhandled texture stage state changes
for(int r=0;r<32;r++)

4
src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl
View File

@ -3690,7 +3690,7 @@ SOOVPA<11> IDirectSound8_SetVelocity_1_0_3936 =
{ 0x33, 0x14 }, // (Offset,Value)-Pair #11
}
};
/*
// ******************************************************************
// * CDirectSound::SetAllParametersB
// ******************************************************************
@ -3790,7 +3790,7 @@ SOOVPA<12> IDirectSound8_SetAllParameters_1_0_3936 =
{ 0x1D, 0xC2 }, // (Offset,Value)-Pair #11
{ 0x1E, 0x0C }, // (Offset,Value)-Pair #12
}
};*/
};
// ******************************************************************
// * IDirectSound8_DownloadEffectsImage

4
src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl
View File

@ -3170,7 +3170,7 @@ OOVPATable DSound_1_0_4627[] =
#endif
},
// IDirectSound8::SetAllParameters (* unchanged since 3936 *)
/*{
{
(OOVPA*)&IDirectSound8_SetAllParameters_1_0_3936,
XTL::EmuIDirectSound8_SetAllParameters,
@ -3178,7 +3178,7 @@ OOVPATable DSound_1_0_4627[] =
#ifdef _DEBUG_TRACE
"EmuIDirectSound8_SetAllParameters"
#endif
},*/
},
// CDirectSoundVoiceSettings_SetMixBins (* unchanged since 4432 *)
{
(OOVPA*)&CDirectSoundVoiceSettings_SetMixBins_1_0_4432, 0,