summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/GLInterface
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
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')
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp4
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/AGL.h2
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp2
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/EGL.h2
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp12
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/GLX.h2
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp2
-rw-r--r--Source/Core/VideoBackends/OGL/GLInterface/WGL.h2
8 files changed, 12 insertions, 16 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp b/Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp
index 62ee8e5a35..924fdea821 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp
+++ b/Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp
@@ -15,7 +15,7 @@ void cInterfaceAGL::Swap()
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceAGL::Create(void *window_handle, bool core)
+bool cInterfaceAGL::Create(void *window_handle)
{
cocoaWin = reinterpret_cast<NSView*>(window_handle);
NSSize size = [cocoaWin frame].size;
@@ -33,7 +33,7 @@ bool cInterfaceAGL::Create(void *window_handle, bool core)
s_backbuffer_width = size.width;
s_backbuffer_height = size.height;
- NSOpenGLPixelFormatAttribute attr[] = { NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, NSOpenGLPFAAccelerated, core ? NSOpenGLProfileVersion3_2Core : 0u, 0u };
+ NSOpenGLPixelFormatAttribute attr[] = { NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, NSOpenGLPFAAccelerated, 0 };
NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
initWithAttributes: attr];
if (fmt == nil)
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/AGL.h b/Source/Core/VideoBackends/OGL/GLInterface/AGL.h
index 4e453aab29..f228bcb877 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/AGL.h
+++ b/Source/Core/VideoBackends/OGL/GLInterface/AGL.h
@@ -17,7 +17,7 @@ private:
NSOpenGLContext *cocoaCtx;
public:
void Swap();
- bool Create(void *window_handle, bool core);
+ bool Create(void *window_handle);
bool MakeCurrent();
bool ClearCurrent();
void Shutdown();
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp b/Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp
index 43c399e8ba..3649886104 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp
@@ -96,7 +96,7 @@ void cInterfaceEGL::DetectMode()
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceEGL::Create(void *window_handle, bool core)
+bool cInterfaceEGL::Create(void *window_handle)
{
const char *s;
EGLint egl_major, egl_minor;
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/EGL.h b/Source/Core/VideoBackends/OGL/GLInterface/EGL.h
index d1b78d5e5c..5309d81401 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/EGL.h
+++ b/Source/Core/VideoBackends/OGL/GLInterface/EGL.h
@@ -26,7 +26,7 @@ public:
void Swap();
void SetMode(u32 mode) { s_opengl_mode = mode; }
void* GetFuncAddress(const std::string& name);
- bool Create(void *window_handle, bool core);
+ bool Create(void *window_handle);
bool MakeCurrent();
bool ClearCurrent();
void Shutdown();
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[] =
{
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/GLX.h b/Source/Core/VideoBackends/OGL/GLInterface/GLX.h
index d1431f9112..b9d047bc0c 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/GLX.h
+++ b/Source/Core/VideoBackends/OGL/GLInterface/GLX.h
@@ -23,7 +23,7 @@ public:
void SwapInterval(int Interval) override;
void Swap() override;
void* GetFuncAddress(const std::string& name) override;
- bool Create(void *window_handle, bool core) override;
+ bool Create(void *window_handle) override;
bool MakeCurrent() override;
bool ClearCurrent() override;
void Shutdown() override;
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp b/Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp
index 27f36e617d..b974bb5955 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp
+++ b/Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp
@@ -57,7 +57,7 @@ bool cInterfaceWGL::PeekMessages()
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool cInterfaceWGL::Create(void *window_handle, bool core)
+bool cInterfaceWGL::Create(void *window_handle)
{
if (window_handle == nullptr)
return false;
diff --git a/Source/Core/VideoBackends/OGL/GLInterface/WGL.h b/Source/Core/VideoBackends/OGL/GLInterface/WGL.h
index 4382a0cf9a..6c1ece457d 100644
--- a/Source/Core/VideoBackends/OGL/GLInterface/WGL.h
+++ b/Source/Core/VideoBackends/OGL/GLInterface/WGL.h
@@ -13,7 +13,7 @@ public:
void SwapInterval(int Interval);
void Swap();
void* GetFuncAddress(const std::string& name);
- bool Create(void *window_handle, bool core);
+ bool Create(void *window_handle);
bool MakeCurrent();
bool ClearCurrent();
void Shutdown();