Merge pull request #3066 from degasus/master

GLInterface: Fix VideoSW on linux + OSX (v2)

Conflicts:
	Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
This commit is contained in:
flacs
2015-09-20 03:30:46 +02:00
committed by Jules Blok
parent 2814aa20c8
commit bfd5c6c69d
10 changed files with 20 additions and 15 deletions

View File

@ -17,7 +17,7 @@ private:
NSOpenGLContext *cocoaCtx;
public:
void Swap();
bool Create(void *window_handle);
bool Create(void *window_handle, bool core);
bool MakeCurrent();
bool ClearCurrent();
void Shutdown();