mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-01 07:52:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7274 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-03-02 15:13:13 +00:00
parent a1055bf5bf
commit 3ffdcf1aec
6 changed files with 84 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View file

@ -176,12 +176,14 @@ bool VideoBackend::Initialize(void *&window_handle)
OSD::AddMessage("Dolphin OpenGL Video Backend.", 5000);
s_BackendInitialized = true;
if (!OpenGL_MakeCurrent())
{
ERROR_LOG(VIDEO, "Unable to connect to OpenGL context.");
OpenGL_Shutdown();
return false;
}
return true;
}
// This is called after Initialize() from the Core
// Run from the graphics thread
void VideoBackend::Video_Prepare()
{
OpenGL_MakeCurrent();
g_renderer = new Renderer;
@ -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,25 +218,29 @@ void VideoBackend::Shutdown()
{
s_BackendInitialized = false;
s_efbAccessRequested = false;
s_FifoShuttingDown = false;
s_swapRequested = false;
DLCache::Shutdown();
Fifo_Shutdown();
PostProcessing::Shutdown();
if (g_renderer)
{
s_efbAccessRequested = false;
s_FifoShuttingDown = false;
s_swapRequested = false;
DLCache::Shutdown();
Fifo_Shutdown();
PostProcessing::Shutdown();
// The following calls are NOT Thread Safe
// And need to be called from the video thread
TextureConverter::Shutdown();
VertexLoaderManager::Shutdown();
VertexShaderCache::Shutdown();
VertexShaderManager::Shutdown();
PixelShaderManager::Shutdown();
PixelShaderCache::Shutdown();
delete g_vertex_manager;
delete g_texture_cache;
OpcodeDecoder_Shutdown();
delete g_renderer;
// The following calls are NOT Thread Safe
// And need to be called from the video thread
TextureConverter::Shutdown();
VertexLoaderManager::Shutdown();
VertexShaderCache::Shutdown();
VertexShaderManager::Shutdown();
PixelShaderManager::Shutdown();
PixelShaderCache::Shutdown();
delete g_vertex_manager;
delete g_texture_cache;
OpcodeDecoder_Shutdown();
delete g_renderer;
g_renderer = NULL;
}
OpenGL_Shutdown();
}