From a7e9a154a58ce1cda9b2b721e57f4045f58c20eb Mon Sep 17 00:00:00 2001 From: Markus Wick Date: Fri, 18 Sep 2015 13:40:09 +0200 Subject: Revert "GLInterface: Fix VideoSW on linux + OSX" --- Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp') 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[] = { -- cgit v1.2.3