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

Disabled D3D_AllocContiguousMemory patch as it just calls MmAllocateContiguousMemory

This commit is contained in:
PatrickvL 2017-02-07 16:49:56 +01:00
parent 1960e1afee
commit 7d683aa37e
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -8821,6 +8821,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetDepthClipPlanes)
return hRet; return hRet;
} }
#if 0 // DISABLED (Just calls MmAllocateContiguousMemory)
// ****************************************************************** // ******************************************************************
// * patch: D3D_AllocContiguousMemory // * patch: D3D_AllocContiguousMemory
// ****************************************************************** // ******************************************************************
@ -8866,6 +8867,7 @@ PVOID WINAPI XTL::EMUPATCH(D3D_AllocContiguousMemory)
return pRet; return pRet;
} }
#endif
// ****************************************************************** // ******************************************************************
// * patch: IDirect3DTexture8_GetLevelDesc // * patch: IDirect3DTexture8_GetLevelDesc

2
src/CxbxKrnl/EmuD3D8.h
View File

@ -1506,6 +1506,7 @@ HRESULT WINAPI EMUPATCH(D3DDevice_SetDepthClipPlanes)
DWORD Flags DWORD Flags
); );
#if 0 // DISABLED (Just calls MmAllocateContiguousMemory)
// ****************************************************************** // ******************************************************************
// * patch: D3D_AllocContiguousMemory // * patch: D3D_AllocContiguousMemory
// ****************************************************************** // ******************************************************************
@ -1514,6 +1515,7 @@ PVOID WINAPI EMUPATCH(D3D_AllocContiguousMemory)
SIZE_T dwSize, SIZE_T dwSize,
DWORD dwAllocAttributes DWORD dwAllocAttributes
); );
#endif
// ****************************************************************** // ******************************************************************
// * patch: D3DTexture_GetLevelDesc // * patch: D3DTexture_GetLevelDesc

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

@ -3406,7 +3406,7 @@ OOVPATable D3D8_3925[] = {
REGISTER_OOVPA(D3DDevice_SetVertexData4s, 3925, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4s, 3925, PATCH),
REGISTER_OOVPA(D3D_SetPushBufferSize, 3925, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3925, PATCH),
REGISTER_OOVPA(D3DResource_GetType, 3925, PATCH), // Probably not even necessary... REGISTER_OOVPA(D3DResource_GetType, 3925, PATCH), // Probably not even necessary...
REGISTER_OOVPA(D3D_AllocContiguousMemory, 3925, PATCH), REGISTER_OOVPA(D3D_AllocContiguousMemory, 3925, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH
// REGISTER_OOVPA(D3DDevice_SetRenderState_Deferred, 3925, PATCH), // REGISTER_OOVPA(D3DDevice_SetRenderState_Deferred, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetLight, 3925, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 3925, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3925, PATCH),

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

@ -1370,7 +1370,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3D_CheckDeviceMultiSampleType, 5558, PATCH), REGISTER_OOVPA(D3D_CheckDeviceMultiSampleType, 5558, PATCH),
REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, PATCH), REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_DrawVertices, 5788, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 5788, PATCH),
REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, PATCH), REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH
REGISTER_OOVPA(Get2DSurfaceDesc, 5788, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 5788, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 5788, PATCH),
REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),

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

@ -1346,7 +1346,7 @@ OOVPATable D3D8_5849[] = {
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5849, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5849, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_DrawVertices, 5849, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 5849, PATCH),
REGISTER_OOVPA(D3D_AllocContiguousMemory, 5849, PATCH), REGISTER_OOVPA(D3D_AllocContiguousMemory, 5849, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH
REGISTER_OOVPA(Get2DSurfaceDesc, 5849, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 5849, PATCH),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 5849, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 5849, PATCH),
REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),