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
This commit is contained in:
WaluigiWare64
2021-01-26 13:19:32 +00:00
committed by GitHub
parent 54b1a752d4
commit ab222ab135
9 changed files with 24 additions and 147 deletions

View File

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