|
@@ -6,6 +6,9 @@
|
|
|
#include <memory>
|
|
#include <memory>
|
|
|
#include <thread>
|
|
#include <thread>
|
|
|
|
|
|
|
|
|
|
+#include <glad/glad.h>
|
|
|
|
|
+
|
|
|
|
|
+#define QT_NO_OPENGL
|
|
|
#include <QDesktopWidget>
|
|
#include <QDesktopWidget>
|
|
|
#include <QtGui>
|
|
#include <QtGui>
|
|
|
#include <QFileDialog>
|
|
#include <QFileDialog>
|
|
@@ -240,6 +243,14 @@ bool GMainWindow::InitializeSystem() {
|
|
|
if (emu_thread != nullptr)
|
|
if (emu_thread != nullptr)
|
|
|
ShutdownGame();
|
|
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
|
|
// Initialize the core emulation
|
|
|
System::Result system_result = System::Init(render_window);
|
|
System::Result system_result = System::Init(render_window);
|
|
|
if (System::Result::Success != system_result) {
|
|
if (System::Result::Success != system_result) {
|