Skip to content

Commit

Permalink
Updates for Outrun2 and more. Alternative D3DDevice_BlockUntilVertica…
Browse files Browse the repository at this point in the history
…lBlank() implementation added.
  • Loading branch information
blueshogun96 committed Oct 10, 2012
1 parent cb671b2 commit f13a1e7
Show file tree
Hide file tree
Showing 28 changed files with 4,203 additions and 131 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
@@ -1,6 +1,3 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio # Custom for Visual Studio
*.cs diff=csharp *.cs diff=csharp
*.sln merge=union *.sln merge=union
Expand Down
8 changes: 8 additions & 0 deletions build/win32/CxbxKrnl.vcproj
Expand Up @@ -539,6 +539,10 @@
<Filter <Filter
Name="EmuXBAudio (h)" Name="EmuXBAudio (h)"
> >
<File
RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\uXboxAdpcmDecoder.h"
>
</File>
<File <File
RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.h" RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.h"
> >
Expand Down Expand Up @@ -1951,6 +1955,10 @@
<Filter <Filter
Name="EmuXBAudio (cpp)" Name="EmuXBAudio (cpp)"
> >
<File
RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\uXboxAdpcmDecoder.c"
>
</File>
<File <File
RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.cpp" RelativePath="..\..\src\CxbxKrnl\EmuXBAudio\XboxAdpcm.cpp"
> >
Expand Down
95 changes: 94 additions & 1 deletion doc/ShogunChangelog.txt
Expand Up @@ -1310,4 +1310,97 @@ TODO: Verify that Lock3DSurface is the same on other XDKs like Lock2DSurface
for Castlevania). for Castlevania).


(*) Needed an alternative signature for this one. (*) Needed an alternative signature for this one.
(**) Needed a new signature. (**) Needed a new signature.

1/14/12
- Added the following function(s)
D3DDevice_SetVertexShaderConstant1Fast (5558)
D3DDevice_LoadVertexShaderProgram (5558)
D3DDevice_SetPixelShaderProgram (5558)
XID_fCloseDevice (5558)
XInputClose (5558)
CDirectSound::SetPosition (5558)
IDirectSound8_SetPosition (5558)
CDirectSound::SetVelocity (5558)
IDirectSound8_SetPosition (5558)
CDirectSound::CreateStream (5558)
IDirectSound8_CreateStream (5558)
CDirectSoundStream::SetRolloffCurve (5558)
CDirectSoundStream::SetMinDistance (5558)
CDirectSoundStream::SetHeadroom (5558)
CDirectSoundStream::SetFrequency (5558)

2/29/12
- Added the following function(s)
D3DDevice_SetRenderState_BackFillMode (5344-5558)
D3DDevice_SetRenderState_TextureFactor (5344-5558)
D3DDevice_SetRenderState_MultiSampleMask (5344-5558)
D3DDevice_SetRenderState_MultiSampleMode (5455, 5558)
D3DDevice_SetRenderState_MultiSampleRenderTargetMode (5455, 5558)
D3DDevice_SetRenderState_Dxt1NoiseEnable (5455, 5558)
D3DDevice_SetRenderState_StencilCullEnable (5344-5558)
D3DDevice_SetTextureState_ColorKeyColor (5344-5558)

9/24/12
- Added the following function(s)
D3DDevice_GetBackBuffer2 (5344)
D3DDevice_SetVerticalBlankCallback (5344)
D3DDevice_SetSwapCallback (5344)
D3DDevice_GetViewport (5344)
CDirectSoundVoice::SetMaxDistance (5344)
CDirectSoundBuffer::SetMaxDistance (5344)
IDirectSoundBuffer_SetMaxDistance (5344)
CDirectSoundVoice::SetMinDistance (5344)
CDirectSoundBuffer::SetMinDistance (5344)
IDirectSoundBuffer_SetMinDistance (5344)
CDirectSound::SetI3DL2Listener (5344)
IDirectSound_SetI3DL2Listener (5344)
CDirectSound::SetRolloffFactor (5344)
IDirectSound_SetRolloffFactor (5344)
CDirectSound::SetDistanceFactor (5344)
IDirectSound_SetDistanceFactor (5344)
CDirectSound::SetDopplerFactor (5344)
IDirectSound_SetDopplerFactor (5344)
D3DDevice_SetRenderTargetFast (5344)
D3DDevice_SetScreenSpaceOffset (5344)
D3DDevice_SetScissors (5344)
D3DDevice_SetMaterial (5344)
D3DCubeTexture_GetCubeMapSurface2 (5344, 5849)
D3DDevice_SetVertexShaderConstant1Fast (5788, 5849)

9/27/12
- Added the following function(s)
XAudioDownloadEffectsImage (5849)
IDirectSound_SetEffectData (5849) (No X-Refs!)
D3DDevice_SetScissors (5849)
D3DDevice_GetScissors (5849)
D3DDevice_GetBackMaterial (5849)
D3DDevice_CaptureStateBlock (5849)
D3DDevice_ApplyStateBlock (5849)
D3DDevice_SetRenderState_StencilCullEnable (5849)
D3DDevice_SetRenderState_OcclusionCullEnable (5849)
XFileMediaObject_Seek (XDK Independent)
CDirectSoundStream::SetFormat (5849)
CDirectSoundStream::SetPitch (5849)
CDirectSoundStream::SetHeadroom (5849)
XFileMediaObject_AddRef (XDK Independent)
XFileMediaObject_Release (XDK Independent)
XFileMediaObject_GetInfo (XDK Independent)
XFileMediaObject_GetStatus (XDK Independent)
XFileMediaObject_Process (XDK Independent)
XFileMediaObject_DoWork (XDK Independent)
XFileMediaObject_Discontinuity (XDK Independent)
CDirectSoundBuffer::Play (5849)
IDirectSoundBuffer_Play (5849)
D3DDevice_GetTexture2 (5849)

- Fixed a bug in EmuIDirect3DResource8_Register to prevent crashing.
- Outrun2 is starting to work!

9/28/12
- Added the following function(s)
D3DDevice_SetRenderTargetFast (5455 - 5849)

- Fixed a [stupid] error in D3DDevice_GetTexture2. It was my fault, so
I have no one to blame but myself this time. This should (hopefully)
fix Panzer Dragoon ORTA's issue with Pandora's Box.
4 changes: 3 additions & 1 deletion src/CxbxKrnl/Emu.cpp
Expand Up @@ -762,10 +762,12 @@ extern int EmuException(LPEXCEPTION_POINTERS e)
" EIP := 0x%.08X EFL := 0x%.08X\n" " EIP := 0x%.08X EFL := 0x%.08X\n"
" EAX := 0x%.08X EBX := 0x%.08X ECX := 0x%.08X EDX := 0x%.08X\n" " EAX := 0x%.08X EBX := 0x%.08X ECX := 0x%.08X EDX := 0x%.08X\n"
" ESI := 0x%.08X EDI := 0x%.08X ESP := 0x%.08X EBP := 0x%.08X\n" " ESI := 0x%.08X EDI := 0x%.08X ESP := 0x%.08X EBP := 0x%.08X\n"
" CR2 := 0x%.08X\n"
"\n", "\n",
e->ContextRecord->Eip, e->ContextRecord->EFlags, e->ContextRecord->Eip, e->ContextRecord->EFlags,
e->ContextRecord->Eax, e->ContextRecord->Ebx, e->ContextRecord->Ecx, e->ContextRecord->Edx, e->ContextRecord->Eax, e->ContextRecord->Ebx, e->ContextRecord->Ecx, e->ContextRecord->Edx,
e->ContextRecord->Esi, e->ContextRecord->Edi, e->ContextRecord->Esp, e->ContextRecord->Ebp); e->ContextRecord->Esi, e->ContextRecord->Edi, e->ContextRecord->Esp, e->ContextRecord->Ebp,
e->ContextRecord->Dr2);


#ifdef _DEBUG #ifdef _DEBUG
CONTEXT Context = *(e->ContextRecord); CONTEXT Context = *(e->ContextRecord);
Expand Down

0 comments on commit f13a1e7

Please sign in to comment.