mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 00:50:00 +00:00
fix custom pipes mem leak
This commit is contained in:
parent
d39c145f60
commit
14f7dbade8
|
@ -274,12 +274,26 @@ CGame::InitialiseRenderWare(void)
|
||||||
CPlayerSkin::Initialise();
|
CPlayerSkin::Initialise();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef EXTENDED_PIPELINES
|
||||||
|
CustomPipes::CustomPipeInit(); // need Scene.world for this
|
||||||
|
#endif
|
||||||
|
#ifdef SCREEN_DROPLETS
|
||||||
|
ScreenDroplets::InitDraw();
|
||||||
|
#endif
|
||||||
|
|
||||||
return (true);
|
return (true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// missing altogether on PS2
|
// missing altogether on PS2
|
||||||
void CGame::ShutdownRenderWare(void)
|
void CGame::ShutdownRenderWare(void)
|
||||||
{
|
{
|
||||||
|
#ifdef SCREEN_DROPLETS
|
||||||
|
ScreenDroplets::Shutdown();
|
||||||
|
#endif
|
||||||
|
#ifdef EXTENDED_PIPELINES
|
||||||
|
CustomPipes::CustomPipeShutdown();
|
||||||
|
#endif
|
||||||
|
|
||||||
CMBlur::MotionBlurClose();
|
CMBlur::MotionBlurClose();
|
||||||
DestroySplashScreen();
|
DestroySplashScreen();
|
||||||
CHud::Shutdown();
|
CHud::Shutdown();
|
||||||
|
|
|
@ -480,14 +480,7 @@ Initialise3D(void *param)
|
||||||
DebugMenuInit();
|
DebugMenuInit();
|
||||||
DebugMenuPopulate();
|
DebugMenuPopulate();
|
||||||
#endif // !DEBUGMENU
|
#endif // !DEBUGMENU
|
||||||
bool ret = CGame::InitialiseRenderWare();
|
return CGame::InitialiseRenderWare();
|
||||||
#ifdef EXTENDED_PIPELINES
|
|
||||||
CustomPipes::CustomPipeInit(); // need Scene.world for this
|
|
||||||
#endif
|
|
||||||
#ifdef SCREEN_DROPLETS
|
|
||||||
ScreenDroplets::InitDraw();
|
|
||||||
#endif
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (FALSE);
|
return (FALSE);
|
||||||
|
@ -496,12 +489,6 @@ Initialise3D(void *param)
|
||||||
static void
|
static void
|
||||||
Terminate3D(void)
|
Terminate3D(void)
|
||||||
{
|
{
|
||||||
#ifdef SCREEN_DROPLETS
|
|
||||||
ScreenDroplets::Shutdown();
|
|
||||||
#endif
|
|
||||||
#ifdef EXTENDED_PIPELINES
|
|
||||||
CustomPipes::CustomPipeShutdown();
|
|
||||||
#endif
|
|
||||||
CGame::ShutdownRenderWare();
|
CGame::ShutdownRenderWare();
|
||||||
#ifdef DEBUGMENU
|
#ifdef DEBUGMENU
|
||||||
DebugMenuShutdown();
|
DebugMenuShutdown();
|
||||||
|
|
|
@ -171,6 +171,9 @@ DestroyVehiclePipe(void)
|
||||||
rw::d3d::destroyVertexShader(neoVehicle_VS);
|
rw::d3d::destroyVertexShader(neoVehicle_VS);
|
||||||
neoVehicle_VS = nil;
|
neoVehicle_VS = nil;
|
||||||
|
|
||||||
|
rw::d3d::destroyPixelShader(neoVehicle_PS);
|
||||||
|
neoVehicle_PS = nil;
|
||||||
|
|
||||||
((rw::d3d9::ObjPipeline*)vehiclePipe)->destroy();
|
((rw::d3d9::ObjPipeline*)vehiclePipe)->destroy();
|
||||||
vehiclePipe = nil;
|
vehiclePipe = nil;
|
||||||
}
|
}
|
||||||
|
@ -362,6 +365,12 @@ CreateGlossPipe(void)
|
||||||
void
|
void
|
||||||
DestroyGlossPipe(void)
|
DestroyGlossPipe(void)
|
||||||
{
|
{
|
||||||
|
rw::d3d::destroyVertexShader(neoGloss_VS);
|
||||||
|
neoGloss_VS = nil;
|
||||||
|
|
||||||
|
rw::d3d::destroyPixelShader(neoGloss_PS);
|
||||||
|
neoGloss_PS = nil;
|
||||||
|
|
||||||
((rw::d3d9::ObjPipeline*)glossPipe)->destroy();
|
((rw::d3d9::ObjPipeline*)glossPipe)->destroy();
|
||||||
glossPipe = nil;
|
glossPipe = nil;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue