ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Undid the merges made to the OpenGL plug-in's Init and Shutdown functions as these changes broke non-Windows builds. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6241 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-09-30 16:11:31 +00:00
parent 719521eeeb
commit 1450385a53
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -210,26 +210,32 @@ void Initialize(void *init)
void Video_Prepare() void Video_Prepare()
{ {
OpenGL_MakeCurrent(); OpenGL_MakeCurrent();
if (!Renderer::Init()) {
g_VideoInitialize.pLog("Renderer::Create failed\n", TRUE);
PanicAlert("Can't create opengl renderer. You might be missing some required opengl extensions, check the logs for more info");
exit(1);
}
s_efbAccessRequested = FALSE; s_efbAccessRequested = FALSE;
s_FifoShuttingDown = FALSE; s_FifoShuttingDown = FALSE;
s_swapRequested = FALSE; s_swapRequested = FALSE;
// internal interfaces CommandProcessor::Init();
Renderer::Init(); PixelEngine::Init();
TextureCache::Init(); TextureCache::Init();
VertexManager::Init();
BPInit(); BPInit();
Fifo_Init(); VertexManager::Init();
VertexLoaderManager::Init(); Fifo_Init(); // must be done before OpcodeDecoder_Init()
OpcodeDecoder_Init(); OpcodeDecoder_Init();
VertexShaderCache::Init(); VertexShaderCache::Init();
VertexShaderManager::Init(); VertexShaderManager::Init();
PixelShaderCache::Init(); PixelShaderCache::Init();
PixelShaderManager::Init(); PixelShaderManager::Init();
CommandProcessor::Init();
PixelEngine::Init();
PostProcessing::Init(); PostProcessing::Init();
GL_REPORT_ERRORD();
VertexLoaderManager::Init();
TextureConverter::Init(); TextureConverter::Init();
DLCache::Init(); DLCache::Init();
@ -238,6 +244,7 @@ void Video_Prepare()
s_PluginInitialized = true; s_PluginInitialized = true;
INFO_LOG(VIDEO, "Video plugin initialized."); INFO_LOG(VIDEO, "Video plugin initialized.");
} }
void Shutdown() void Shutdown()
@ -247,24 +254,23 @@ void Shutdown()
s_efbAccessRequested = FALSE; s_efbAccessRequested = FALSE;
s_FifoShuttingDown = FALSE; s_FifoShuttingDown = FALSE;
s_swapRequested = FALSE; s_swapRequested = FALSE;
// VideoCommon
DLCache::Shutdown(); DLCache::Shutdown();
Fifo_Shutdown(); Fifo_Shutdown();
PostProcessing::Shutdown(); PostProcessing::Shutdown();
CommandProcessor::Shutdown();
PixelShaderManager::Shutdown(); // The following calls are NOT Thread Safe
VertexShaderManager::Shutdown(); // And need to be called from the video thread
OpcodeDecoder_Shutdown();
VertexLoaderManager::Shutdown();
PixelShaderCache::Shutdown();
TextureConverter::Shutdown(); TextureConverter::Shutdown();
VertexLoaderManager::Shutdown();
VertexShaderCache::Shutdown(); VertexShaderCache::Shutdown();
VertexShaderManager::Shutdown();
PixelShaderManager::Shutdown();
PixelShaderCache::Shutdown();
VertexManager::Shutdown(); VertexManager::Shutdown();
TextureCache::Shutdown(); TextureCache::Shutdown();
OpcodeDecoder_Shutdown();
Renderer::Shutdown(); Renderer::Shutdown();
OpenGL_Shutdown(); OpenGL_Shutdown();
EmuWindow::Close();
} }
static volatile struct static volatile struct