Put the video prepare code back, and use the existence of the g_renderer to determine if video prepare has been run or not.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7274 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/VideoCommon/Src/RenderBase.cpp

@@ -43,7 +43,7 @@
 int frameCount;
 int OSDChoice, OSDTime;
 
-Renderer *g_renderer;
+Renderer *g_renderer = NULL;
 
 bool s_bLastFrameDumped = false;
 Common::CriticalSection Renderer::s_criticalScreenshot;

Source/Plugins/Plugin_VideoDX11/Src/main.cpp

@@ -174,6 +174,11 @@ bool VideoBackend::Initialize(void *&window_handle)
 	OSD::AddMessage("Dolphin Direct3D11 Video Backend.", 5000);
 	s_BackendInitialized = true;
 
+	return true;
+}
+
+void VideoBackend::Video_Prepare()
+{
 	// Better be safe...
 	s_efbAccessRequested = FALSE;
 	s_FifoShuttingDown = FALSE;
@@ -198,11 +203,6 @@ bool VideoBackend::Initialize(void *&window_handle)
 	PixelEngine::Init();
 	DLCache::Init();
 
-	return true;
-}
-
-void VideoBackend::Video_Prepare()
-{
 	// Tell the host that the window is ready
 	Core::Callback_CoreMessage(WM_USER_CREATE);
 }
@@ -211,6 +211,8 @@ void VideoBackend::Shutdown()
 {
 	s_BackendInitialized = false;
 
+	if (g_renderer)
+	{
 		s_efbAccessRequested = FALSE;
 		s_FifoShuttingDown = FALSE;
 		s_swapRequested = FALSE;
@@ -231,9 +233,9 @@ void VideoBackend::Shutdown()
 		delete g_vertex_manager;
 		delete g_texture_cache;
 		delete g_renderer;
+		g_renderer = NULL;
+	}
 	EmuWindow::Close();
-
-	s_BackendInitialized = false;
 }
 
 }

Source/Plugins/Plugin_VideoDX9/Src/main.cpp

@@ -159,6 +159,11 @@ bool VideoBackend::Initialize(void *&window_handle)
 	OSD::AddMessage("Dolphin Direct3D9 Video Backend.", 5000);
 	s_BackendInitialized = true;
 
+	return true;
+}
+
+void VideoBackend::Video_Prepare()
+{
 	// Better be safe...
 	s_efbAccessRequested = FALSE;
 	s_FifoShuttingDown = FALSE;
@@ -179,11 +184,6 @@ bool VideoBackend::Initialize(void *&window_handle)
 	PixelEngine::Init();
 	DLCache::Init();
 
-	return true;
-}
-
-void VideoBackend::Video_Prepare()
-{
 	// Notify the core that the video backend is ready
 	Core::Callback_CoreMessage(WM_USER_CREATE);
 }
@@ -192,6 +192,8 @@ void VideoBackend::Shutdown()
 {
 	s_BackendInitialized = false;
 
+	if (g_renderer)
+	{
 		s_efbAccessRequested = FALSE;
 		s_FifoShuttingDown = FALSE;
 		s_swapRequested = FALSE;
@@ -211,6 +213,8 @@ void VideoBackend::Shutdown()
 		delete g_vertex_manager;
 		delete g_texture_cache;
 		delete g_renderer;
+		g_renderer = NULL;
+	}
 	D3D::Shutdown();
 	EmuWindow::Close();
 }

Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp

@@ -529,15 +529,6 @@ bool OpenGL_MakeCurrent()
 	return true;
 }
 
-bool OpenGL_ReleaseContext()
-{
-#ifdef _WIN32
-	return wglMakeCurrent(NULL, NULL);
-#elif defined(HAVE_X11) && HAVE_X11
-	return glXMakeCurrent(GLWin.dpy, None, NULL);
-#endif
-}
-
 // Update window width, size and etc. Called from Render.cpp
 void OpenGL_Update()
 {

Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h

@@ -87,7 +87,6 @@ bool OpenGL_Create(void *&);
 void OpenGL_Shutdown();
 void OpenGL_Update();
 bool OpenGL_MakeCurrent();
-bool OpenGL_ReleaseContext();
 void OpenGL_SwapBuffers();
 
 // Get status

Source/Plugins/Plugin_VideoOGL/Src/main.cpp

@@ -176,13 +176,15 @@ bool VideoBackend::Initialize(void *&window_handle)
 	OSD::AddMessage("Dolphin OpenGL Video Backend.", 5000);
 	s_BackendInitialized = true;
 
-	if (!OpenGL_MakeCurrent())
+	return true;
-	{
-		ERROR_LOG(VIDEO, "Unable to connect to OpenGL context.");
-		OpenGL_Shutdown();
-		return false;
 }
 
+// This is called after Initialize() from the Core
+// Run from the graphics thread
+void VideoBackend::Video_Prepare()
+{
+	OpenGL_MakeCurrent();
+
 	g_renderer = new Renderer;
 
 	s_efbAccessRequested = false;
@@ -208,22 +210,6 @@ bool VideoBackend::Initialize(void *&window_handle)
 	TextureConverter::Init();
 	DLCache::Init();
 
-	if (!OpenGL_ReleaseContext())
-	{
-		ERROR_LOG(VIDEO, "Unable to release OpenGL context.");
-		Shutdown();
-		return false;
-	}
-
-	return true;
-}
-
-// This is called after Initialize() from the Core
-// Run from the graphics thread
-void VideoBackend::Video_Prepare()
-{
-	OpenGL_MakeCurrent();
-
 	// Notify the core that the video backend is ready
 	Core::Callback_CoreMessage(WM_USER_CREATE);
 }
@@ -232,6 +218,8 @@ void VideoBackend::Shutdown()
 {
 	s_BackendInitialized = false;
 
+	if (g_renderer)
+	{
 		s_efbAccessRequested = false;
 		s_FifoShuttingDown = false;
 		s_swapRequested = false;
@@ -251,6 +239,8 @@ void VideoBackend::Shutdown()
 		delete g_texture_cache;
 		OpcodeDecoder_Shutdown();
 		delete g_renderer;
+		g_renderer = NULL;
+	}
 	OpenGL_Shutdown();
 }