OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 08:21:04 +00:00
Code Issues Projects Releases Wiki Activity

QT context set to 2.1, misc fixes.

Browse Source
This commit is contained in:
Kitlith 2015-05-09 18:33:19 -07:00
parent 20b2afe509
commit 434228af61
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra_qt/bootmanager.cpp
View File

@ -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 // 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(2,1);
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
fmt.setOption(QGL::NoDeprecatedFunctions);
child = new GGLWidgetInternal(fmt, this); child = new GGLWidgetInternal(fmt, this);
QBoxLayout* layout = new QHBoxLayout(this); QBoxLayout* layout = new QHBoxLayout(this);

4
src/video_core/renderer_opengl/generated/Readme.md
View File

@ -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
``` ```

2
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

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