piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Logical reorderring of the GUI boot sequence. Also a little clean up in the OpenGL plugin.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5379 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-04-17 03:17:36 +00:00
parent 3b35cb12f2
commit 0a12b9d9f5
7 changed files with 83 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -445,20 +445,6 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
return true;
}
bool OpenGL_Initialize()
{
bool success = OpenGL_MakeCurrent();
if (!success)
{
PanicAlert("Can't Activate The GL Rendering Context.");
return false;
}
// Notify the core that the window is current
g_VideoInitialize.pCoreMessage(WM_USER_CREATE);
return success;
}
bool OpenGL_MakeCurrent()
{
// connect the glx-context to the window

1
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -115,7 +115,6 @@ extern GLWindow GLWin;
bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _width, int _height);
void OpenGL_Shutdown();
void OpenGL_Update();
bool OpenGL_Initialize();
bool OpenGL_MakeCurrent();
void OpenGL_SwapBuffers();

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

@ -349,7 +349,7 @@ void EmuStateChange(PLUGIN_EMUSTATE newState)
// This is called after Video_Initialize() from the Core
void Video_Prepare(void)
{
OpenGL_Initialize();
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");
@ -379,6 +379,9 @@ void Video_Prepare(void)
TextureConverter::Init();
DLCache::Init();
// Notify the core that the video plugin is ready
g_VideoInitialize.pCoreMessage(WM_USER_CREATE);
s_PluginInitialized = true;
INFO_LOG(VIDEO, "Video plugin initialized.");
}