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

Remove patch to CreateVertexBuffer

This commit is contained in:
Luke Usher 2017-04-04 11:45:35 +01:00
parent fea81cd01d
commit 2339d7af28
15 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -4424,6 +4424,9 @@ HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register)
X_D3DVertexBuffer *pVertexBuffer = (X_D3DVertexBuffer*)pResource;
// Vertex buffers live in Physical Memory Region
pBase = (void*)((xbaddr)pBase | MM_SYSTEM_PHYSICAL_MAP);
// create vertex buffer
{
DWORD dwSize = g_MemoryManager.QueryAllocationSize(pBase);
@ -7429,6 +7432,8 @@ VOID WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock)
");\n",
ppVertexBuffer, OffsetToLock, SizeToLock, ppbData, Flags);
EmuVerifyResourceIsRegistered(ppVertexBuffer);
IDirect3DVertexBuffer8 *pVertexBuffer8 = ppVertexBuffer->EmuVertexBuffer8;
HRESULT hRet = pVertexBuffer8->Lock(OffsetToLock, SizeToLock, ppbData, Flags);
@ -7461,6 +7466,8 @@ BYTE* WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock2)
IDirect3DVertexBuffer8 *pVertexBuffer8 = NULL;
EmuVerifyResourceIsRegistered(ppVertexBuffer);
BYTE *pbData = NULL;
HRESULT hRet = S_OK;

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
View File

@ -3724,7 +3724,7 @@ OOVPATable D3D8_3925[] = {
REGISTER_OOVPA(D3DDevice_GetBackBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetRenderTarget, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
View File

@ -1191,7 +1191,7 @@ OOVPATable D3D8_4034[] = {
REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
View File

@ -2040,7 +2040,7 @@ OOVPATable D3D8_4134[] = {
REGISTER_OOVPA(D3DDevice_Present, 3925, PATCH),
// REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
// REGISTER_OOVPA(D3DVertexBuffer_Lock, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
View File

@ -1843,7 +1843,7 @@ OOVPATable D3D8_4361[] = {
REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_Swap, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_EnableOverlay, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_UpdateOverlay, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4361, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
View File

@ -774,7 +774,7 @@ OOVPATable D3D8_4432[] {
REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4432, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 4361, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 4531, PATCH),
REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4361, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
View File

@ -3162,7 +3162,7 @@ OOVPATable D3D8_4627[] = {
REGISTER_OOVPA(D3DDevice_Clear, 4627, ALIAS, D3DDevice_ClearB),
REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_EnableOverlay, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_UpdateOverlay, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4627, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
View File

@ -852,7 +852,7 @@ OOVPATable D3D8_5028[] = {
REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_Swap, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_EnableOverlay, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5028, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
View File

@ -1023,7 +1023,7 @@ OOVPATable D3D8_5233[] = {
REGISTER_OOVPA(D3DDevice_Clear, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_EnableOverlay, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
View File

@ -867,7 +867,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_Clear, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_EnableOverlay, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5344, DISABLED),
REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
View File

@ -1514,7 +1514,7 @@ OOVPATable D3D8_5558[] = {
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5558, ALIAS, D3DDevice_SetVertexShaderConstant1Fast),
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5558, DISABLED),
REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_Clear, 5233, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
View File

@ -1343,7 +1343,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH),
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5788, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5788, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
View File

@ -1399,7 +1399,7 @@ OOVPATable D3D8_5849[] = {
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5849, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 5849, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5849, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8LTCG.1.0.5849.inl
View File

@ -972,7 +972,7 @@ OOVPATable D3D8LTCG_5849[] = {
REGISTER_OOVPA(D3DDevice_SetMaterial, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_SetStreamSource, 5849, LTCG),
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5849, DISABLED),
REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 5849, LTCG),
REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 5849, LTCG),
REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 5849, LTCG),

2
src/CxbxKrnl/HLEIntercept.cpp
View File

@ -361,7 +361,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x25);
Decrement = 0x1FC; // TODO: Clean up (?)
Increment = 82 * 4;
patchOffset = 140 * 4; // TODO: Verify
patchOffset = 105 * 4; // TODO: Verify
//Decrement = 0x19F; // TODO: Clean up (?)
//Increment = 72 * 4;