summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/Game.cpp14
-rw-r--r--src/core/main.cpp16
-rw-r--r--src/extras/custompipes_d3d9.cpp9
3 files changed, 24 insertions, 15 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index b6ef7635..348ac26d 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -262,11 +262,25 @@ CGame::InitialiseRenderWare(void)
CPlayerSkin::Initialise();
POP_MEMID();
+#ifdef EXTENDED_PIPELINES
+ CustomPipes::CustomPipeInit(); // need Scene.world for this
+#endif
+#ifdef SCREEN_DROPLETS
+ ScreenDroplets::InitDraw();
+#endif
+
return (true);
}
void CGame::ShutdownRenderWare(void)
{
+#ifdef SCREEN_DROPLETS
+ ScreenDroplets::Shutdown();
+#endif
+#ifdef EXTENDED_PIPELINES
+ CustomPipes::CustomPipeShutdown();
+#endif
+
DestroySplashScreen();
CHud::Shutdown();
CFont::Shutdown();
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 64ef41bc..85e04540 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -481,15 +481,7 @@ Initialise3D(void *param)
DebugMenuInit();
DebugMenuPopulate();
#endif // !DEBUGMENU
- bool ret = CGame::InitialiseRenderWare();
-#ifdef EXTENDED_PIPELINES
- CustomPipes::CustomPipeInit(); // need Scene.world for this
-#endif
-#ifdef SCREEN_DROPLETS
- ScreenDroplets::InitDraw();
-#endif
-
- return ret;
+ return CGame::InitialiseRenderWare();
}
POP_MEMID();
@@ -499,12 +491,6 @@ Initialise3D(void *param)
static void
Terminate3D(void)
{
-#ifdef SCREEN_DROPLETS
- ScreenDroplets::Shutdown();
-#endif
-#ifdef EXTENDED_PIPELINES
- CustomPipes::CustomPipeShutdown();
-#endif
CGame::ShutdownRenderWare();
#ifdef DEBUGMENU
DebugMenuShutdown();
diff --git a/src/extras/custompipes_d3d9.cpp b/src/extras/custompipes_d3d9.cpp
index 28bf65d6..277a487d 100644
--- a/src/extras/custompipes_d3d9.cpp
+++ b/src/extras/custompipes_d3d9.cpp
@@ -172,6 +172,9 @@ DestroyVehiclePipe(void)
rw::d3d::destroyVertexShader(neoVehicle_VS);
neoVehicle_VS = nil;
+ rw::d3d::destroyPixelShader(neoVehicle_PS);
+ neoVehicle_PS = nil;
+
((rw::d3d9::ObjPipeline*)vehiclePipe)->destroy();
vehiclePipe = nil;
}
@@ -363,6 +366,12 @@ CreateGlossPipe(void)
void
DestroyGlossPipe(void)
{
+ rw::d3d::destroyVertexShader(neoGloss_VS);
+ neoGloss_VS = nil;
+
+ rw::d3d::destroyPixelShader(neoGloss_PS);
+ neoGloss_PS = nil;
+
((rw::d3d9::ObjPipeline*)glossPipe)->destroy();
glossPipe = nil;
}