From ac54cd13dbb8e82ccc9134aab212271d2f32b0c8 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 30 Aug 2014 18:17:47 -0300 Subject: OpenGL renderer: Request a forward compatible context in citra-qt This should fix context creation on OS X. Also requests a core context on all platforms in Citra-GLFW, for consistency. --- src/citra/emu_window/emu_window_glfw.cpp | 3 --- src/citra_qt/bootmanager.cpp | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 661521eb7..6cdba2b87 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -42,12 +42,9 @@ EmuWindow_GLFW::EmuWindow_GLFW() { } glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); - -#if EMU_PLATFORM == PLATFORM_MACOSX // GLFW on OSX requires these window hints to be set to create a 3.2+ GL context. glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); -#endif m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 5dce9e570..0430aa1ed 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -113,10 +113,10 @@ GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose QGLFormat fmt; - fmt.setProfile(QGLFormat::CoreProfile); fmt.setVersion(3,2); - fmt.setSampleBuffers(true); - fmt.setSamples(4); + fmt.setProfile(QGLFormat::CoreProfile); + // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X + fmt.setOption(QGL::NoDeprecatedFunctions); child = new GGLWidgetInternal(fmt, this); QBoxLayout* layout = new QHBoxLayout(this); -- cgit v1.2.3