diff options
| author | 2015-08-30 04:29:03 -0300 | |
|---|---|---|
| committer | 2015-08-30 08:45:57 -0300 | |
| commit | 68eb19749456ba653c8286080f5be99ffc1ce5e7 (patch) | |
| tree | fa73927175f3f970a67975ff0519464495d96fca /src | |
| parent | Replace the previous OpenGL loader with a glad-generated 3.3 one (diff) | |
| download | yuzu-68eb19749456ba653c8286080f5be99ffc1ce5e7.tar.gz yuzu-68eb19749456ba653c8286080f5be99ffc1ce5e7.tar.xz yuzu-68eb19749456ba653c8286080f5be99ffc1ce5e7.zip | |
Increase required OpenGL version to 3.3
This gives us several niceties such as Sampler Objects, shader attribute
locations and Timer Queries.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 096efc4a2..9453b1f48 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp | |||
| @@ -89,7 +89,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() { | |||
| 89 | exit(1); | 89 | exit(1); |
| 90 | } | 90 | } |
| 91 | glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); | 91 | glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); |
| 92 | glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); | 92 | glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); |
| 93 | // GLFW on OSX requires these window hints to be set to create a 3.2+ GL context. | 93 | // GLFW on OSX requires these window hints to be set to create a 3.2+ GL context. |
| 94 | glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); | 94 | glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); |
| 95 | glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); | 95 | glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); |
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index f8aacb527..d9bacfc3d 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -109,7 +109,7 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) : | |||
| 109 | 109 | ||
| 110 | // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose | 110 | // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose |
| 111 | QGLFormat fmt; | 111 | QGLFormat fmt; |
| 112 | fmt.setVersion(3,2); | 112 | fmt.setVersion(3,3); |
| 113 | fmt.setProfile(QGLFormat::CoreProfile); | 113 | fmt.setProfile(QGLFormat::CoreProfile); |
| 114 | // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X | 114 | // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X |
| 115 | fmt.setOption(QGL::NoDeprecatedFunctions); | 115 | fmt.setOption(QGL::NoDeprecatedFunctions); |