diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp index f33eaf92c..0e94ee2ab 100644 --- a/src/CxbxKrnl/EmuD3D8.cpp +++ b/src/CxbxKrnl/EmuD3D8.cpp @@ -8821,6 +8821,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetDepthClipPlanes) return hRet; } +#if 0 // DISABLED (Just calls MmAllocateContiguousMemory) // ****************************************************************** // * patch: D3D_AllocContiguousMemory // ****************************************************************** @@ -8866,6 +8867,7 @@ PVOID WINAPI XTL::EMUPATCH(D3D_AllocContiguousMemory) return pRet; } +#endif // ****************************************************************** // * patch: IDirect3DTexture8_GetLevelDesc diff --git a/src/CxbxKrnl/EmuD3D8.h b/src/CxbxKrnl/EmuD3D8.h index 5f7cd3c1c..c068a749b 100644 --- a/src/CxbxKrnl/EmuD3D8.h +++ b/src/CxbxKrnl/EmuD3D8.h @@ -1506,6 +1506,7 @@ HRESULT WINAPI EMUPATCH(D3DDevice_SetDepthClipPlanes) DWORD Flags ); +#if 0 // DISABLED (Just calls MmAllocateContiguousMemory) // ****************************************************************** // * patch: D3D_AllocContiguousMemory // ****************************************************************** @@ -1514,6 +1515,7 @@ PVOID WINAPI EMUPATCH(D3D_AllocContiguousMemory) SIZE_T dwSize, DWORD dwAllocAttributes ); +#endif // ****************************************************************** // * patch: D3DTexture_GetLevelDesc diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl index 76d6009fe..e9470cf48 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl @@ -3406,7 +3406,7 @@ OOVPATable D3D8_3925[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4s, 3925, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3925, PATCH), 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_SetLight, 3925, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3925, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index d8df167fa..789176e73 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -1370,7 +1370,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3D_CheckDeviceMultiSampleType, 5558, PATCH), REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, 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(D3DDevice_CreateTexture2, 5788, PATCH), REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl index 4d476c13e..61229b4a1 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl @@ -1346,7 +1346,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5849, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 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(D3DDevice_CreateTexture2, 5849, PATCH), REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),