Преглед изворни кода

Increase required OpenGL version to 3.3

This gives us several niceties such as Sampler Objects, shader attribute
locations and Timer Queries.
Yuri Kunde Schlesner пре 11 година
родитељ
комит
68eb197494
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      src/citra/emu_window/emu_window_glfw.cpp
  2. 1 1
      src/citra_qt/bootmanager.cpp

+ 1 - 1
src/citra/emu_window/emu_window_glfw.cpp

@@ -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);

+ 1 - 1
src/citra_qt/bootmanager.cpp

@@ -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);