Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move the creation of the GLInterface (and hence the video backend
window) from VideoPrepare to Initialize in the software plugin (as in
the GL plugin).  This fixes issue 6564.  It also makes the emulator show
up positioned correctly in the dolphin application window when using
render to main.
  • Loading branch information
glennricster committed Sep 7, 2013
1 parent 508888c commit 913853d
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
Expand Up @@ -39,7 +39,6 @@ namespace SW
static volatile bool fifoStateRun = false;
static volatile bool emuRunningState = false;
static std::mutex m_csSWVidOccupied;
static void* m_windowhandle;

std::string VideoSoftware::GetName()
{
Expand All @@ -64,7 +63,11 @@ bool VideoSoftware::Initialize(void *&window_handle)
g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
InitInterface();

m_windowhandle = window_handle;
if (!GLInterface->Create(window_handle))
{
INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
return false;
}

InitBPMemory();
InitXFMemory();
Expand Down Expand Up @@ -160,12 +163,6 @@ void VideoSoftware::Video_Cleanup()
// This is called after Video_Initialize() from the Core
void VideoSoftware::Video_Prepare()
{
if (!GLInterface->Create(m_windowhandle))
{
INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
return;
}

GLInterface->MakeCurrent();
// Init extension support.
#ifndef USE_GLES
Expand Down

0 comments on commit 913853d

Please sign in to comment.