citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Increase required OpenGL version to 3.3 

This gives us several niceties such as Sampler Objects, shader attribute
locations and Timer Queries.
This commit is contained in:
Yuri Kunde Schlesner 2015-08-30 04:29:03 -03:00
parent a1a5570e97
commit 68eb197494
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra/emu_window/emu_window_glfw.cpp
View File

@ -89,7 +89,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
exit(1); exit(1);
} }
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
// GLFW on OSX requires these window hints to be set to create a 3.2+ GL context. // 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_FORWARD_COMPAT, GL_TRUE);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);

2
src/citra_qt/bootmanager.cpp
View File

@ -109,7 +109,7 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) :
// TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose
QGLFormat fmt; QGLFormat fmt;
fmt.setVersion(3,2); fmt.setVersion(3,3);
fmt.setProfile(QGLFormat::CoreProfile); fmt.setProfile(QGLFormat::CoreProfile);
// Requests a forward-compatible context, which is required to get a 3.2+ context on OS X // Requests a forward-compatible context, which is required to get a 3.2+ context on OS X
fmt.setOption(QGL::NoDeprecatedFunctions); fmt.setOption(QGL::NoDeprecatedFunctions);