summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2015-09-18 13:48:47 +0200
committerMarkus Wick <degasus@users.noreply.github.com>2015-09-18 13:48:47 +0200
commitb293bd22d669ad8c6fadabc7fe12ec1a1fec4ad3 (patch)
treefd2a0276356af292e34c5514e2b61ded3243f80d /Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
parent8bd1be643c15643f626ada0e3992ba23ccb53363 (diff)
parenta7e9a154a58ce1cda9b2b721e57f4045f58c20eb (diff)
Merge pull request #3060 from dolphin-emu/revert-3054-master
Revert "GLInterface: Fix VideoSW on linux + OSX"
Diffstat (limited to 'Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp b/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
index 2d22ab7101..cd8cc5f070 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
+++ b/Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
@@ -44,7 +44,7 @@ void cInterfaceGLX::Swap()
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceGLX::Create(void *window_handle, bool core)
+bool cInterfaceGLX::Create(void *window_handle)
{
dpy = XOpenDisplay(nullptr);
int screen = DefaultScreen(dpy);
@@ -107,13 +107,9 @@ bool cInterfaceGLX::Create(void *window_handle, bool core)
GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
None
};
- ctx = nullptr;
- if (core)
- {
- ctx = glXCreateContextAttribs(dpy, fbconfig, 0, True, context_attribs);
- XSync(dpy, False);
- }
- if (core && (!ctx || s_glxError))
+ ctx = glXCreateContextAttribs(dpy, fbconfig, 0, True, context_attribs);
+ XSync(dpy, False);
+ if (!ctx || s_glxError)
{
int context_attribs_33[] =
{