QT context set to 2.1, misc fixes.

src/citra_qt/bootmanager.cpp

@@ -97,10 +97,8 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) :
 
     // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose
     QGLFormat fmt;
-    fmt.setVersion(3,2);
+    fmt.setVersion(2,1);
     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);

src/video_core/renderer_opengl/generated/Readme.md

@@ -1,5 +1,5 @@
-These file were generated by the [glLoadGen](https://bitbucket.org/alfonse/glloadgen/wiki/Home) OpenGL loader generator and have been checked in as-is. You can re-generate them using version 2.0.2 of glLoadGen and executing the following command:
+These file were generated by the [glLoadGen](https://bitbucket.org/alfonse/glloadgen/wiki/Home) OpenGL loader generator and have or will be slimmed-down by hand. You can re-generate them using version 2.0.2 of glLoadGen and executing the following command:
 
 ```
-lua LoadGen.lua -version 2.1 -profile core -indent space -ext ARB_vertex_array_object 2_1_core
-```
+lua LoadGen.lua -version 2.1 -profile core -indent space 2_1_core
+```

src/video_core/renderer_opengl/renderer_opengl.cpp

@@ -327,7 +327,7 @@ void RendererOpenGL::Init() {
     render_window->MakeCurrent();
 
     int err = ogl_LoadFunctions();
-    if (ogl_LOAD_SUCCEEDED != err) {
+    if (ogl_LOAD_FAILED == err) {
         LOG_CRITICAL(Render_OpenGL, "Failed to initialize GL functions! Exiting...");
         exit(-1);
     }