From ab222ab135a76c559ef63768e8f90eca99973881 Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Tue, 26 Jan 2021 13:19:32 +0000
Subject: Use libepoxy to load in OpenGL functions (#960)

* Use libepoxy to load in OpenGL functions

Prevents having to load them in manually

* Install libepoxy in the CI

* Do not link OpenGL libraries, libepoxy opens them itself

* Add libepoxy to build instructions
---
 src/frontend/qt_sdl/main.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/frontend/qt_sdl')

diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index be718ab..527a507 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -44,6 +44,10 @@
 
 #include <SDL2/SDL.h>
 
+#ifdef OGLRENDERER_ENABLED
+#include "OpenGLSupport.h"
+#endif
+
 #include "main.h"
 #include "Input.h"
 #include "CheatsDialog.h"
@@ -62,9 +66,6 @@
 
 #include "NDS.h"
 #include "GBACart.h"
-#ifdef OGLRENDERER_ENABLED
-#include "OpenGLSupport.h"
-#endif
 #include "GPU.h"
 #include "SPU.h"
 #include "Wifi.h"
@@ -357,7 +358,7 @@ void EmuThread::run()
     if (hasOGL)
     {
         oglContext->makeCurrent(oglSurface);
-        videoRenderer = OpenGL::Init() ? Config::_3DRenderer : 0;
+        videoRenderer = Config::_3DRenderer;
     }
     else
 #endif
@@ -423,7 +424,7 @@ void EmuThread::run()
                     if (hasOGL)
                     {
                         oglContext->makeCurrent(oglSurface);
-                        videoRenderer = OpenGL::Init() ? Config::_3DRenderer : 0;
+                        videoRenderer = Config::_3DRenderer;
                     }
                     else
 #endif
-- 
cgit v1.2.3