piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 16:49:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explicit dependency on libvideo.

Browse Source 
Back out r6960 for now. The wxGLCanvas may need to be persistent
and owned by DolphinWX in the rendertomain case.

Disambiguate SWVideoConfig.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6962 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-29 06:26:03 +00:00
parent 45024133e2
commit 9b3920d1a9
20 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
View File

@ -16,7 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#include "main.h"
#include "VideoConfig.h"
#include "SWVideoConfig.h"
#include "IniFile.h"
#include "Setup.h"
@ -122,7 +122,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
wxPoint(0, 0), wxSize(_twidth, _theight));
GLWin.glCanvas->Show(true);
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
if (GLWin.glCtxt == NULL) // XXX dirty hack
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
#elif defined(_WIN32)
// Create rendering window in Windows
@ -384,8 +385,8 @@ void OpenGL_Shutdown()
{
#if defined(USE_WX) && USE_WX
GLWin.glCanvas->Hide();
GLWin.glCanvas->Destroy();
delete GLWin.glCtxt;
// XXX GLWin.glCanvas->Destroy();
// XXX delete GLWin.glCtxt;
#elif defined(_WIN32)
if (hRC) // Do We Have A Rendering Context?
{