Correct combiners init/destroy.

Combiner.cpp

@@ -102,15 +102,23 @@ static DWORD64 ACEncodeD[] =
 	7, 7, 7, 7, 7, 7, 7, 7, 0, 1, 2, 3, 4, 5, 7, 7, 7, 7, 7, 6, 7
 };
 
+void Combiner_Init() {
+	CombinerInfo::get().init();
+	InitShaderCombiner();
+}
+
+void Combiner_Destroy() {
+	DestroyShaderCombiner();
+	CombinerInfo::get().destroy();
+}
+
 void CombinerInfo::init()
 {
-	InitShaderCombiner();
 	m_pCurrent = NULL;
 }
 
 void CombinerInfo::destroy()
 {
-	DestroyShaderCombiner();
 	m_pCurrent = NULL;
 	for (Combiners::iterator cur = m_combiners.begin(); cur != m_combiners.end(); ++cur)
 		delete cur->second;

Combiner.h

@@ -146,5 +146,8 @@ ShaderCombiner * currentCombiner() {
 	return CombinerInfo::get().getCurrent();
 }
 
+void Combiner_Init();
+void Combiner_Destroy();
+
 #endif
 

OpenGL.cpp

@@ -516,7 +516,7 @@ bool OGL_Start()
 	textureCache().init();
 	DepthBuffer_Init();
 	FrameBuffer_Init();
-	CombinerInfo::get().init();
+	Combiner_Init();
 	OGL.renderState = GLInfo::rsNone;
 
 	gSP.changed = gDP.changed = 0xFFFFFFFF;
@@ -535,7 +535,7 @@ bool OGL_Start()
 
 void OGL_Stop()
 {
-	CombinerInfo::get().destroy();
+	Combiner_Destroy();
 	FrameBuffer_Destroy();
 	DepthBuffer_Destroy();
 	textureCache().destroy();