Frontends, VideoCore: Move glad initialisation to the frontend
On SDL2 this allows it to use SDL_GL_GetProcAddress() instead of the default function loader, and fixes a crash when using apitrace with an EGL context. On Qt we will need to migrate from QGLWidget to QOpenGLWidget and QOpenGLContext before we can use gladLoadGLLoader() instead of gladLoadGL(), since the former doesn’t expose a function loader.
This commit is contained in:
parent
75cbfeee58
commit
aa4d4ff23c
3 changed files with 18 additions and 6 deletions
|
@ -6,6 +6,9 @@
|
|||
#include <memory>
|
||||
#include <thread>
|
||||
|
||||
#include <glad/glad.h>
|
||||
|
||||
#define QT_NO_OPENGL
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui>
|
||||
#include <QFileDialog>
|
||||
|
@ -240,6 +243,14 @@ bool GMainWindow::InitializeSystem() {
|
|||
if (emu_thread != nullptr)
|
||||
ShutdownGame();
|
||||
|
||||
render_window->MakeCurrent();
|
||||
if (!gladLoadGL()) {
|
||||
QMessageBox::critical(this, tr("Error while starting Citra!"),
|
||||
tr("Failed to initialize the video core!\n\n"
|
||||
"Please ensure that your GPU supports OpenGL 3.3 and that you have the latest graphics driver."));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Initialize the core emulation
|
||||
System::Result system_result = System::Init(render_window);
|
||||
if (System::Result::Success != system_result) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue