sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenGLRenderer: remove opengl32 dependency on Linux

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-09-01 19:28:10 +02:00
parent e6c2302927
commit c7b0d103e1
7 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
View File

@@ -48,12 +48,6 @@ namespace Nz
bool OpenGLRenderer::Prepare(const ParameterList& parameters)
{
if (!m_opengl32Lib.Load("opengl32" NAZARA_DYNLIB_EXTENSION))
{
NazaraError("Failed to load opengl32 library, is OpenGL installed on your system?");
return false;
}
std::unique_ptr<GL::Loader> loader = SelectLoader();
if (!loader)
{
@@ -73,7 +67,7 @@ namespace Nz
#if defined(NAZARA_PLATFORM_WINDOWS) || defined(NAZARA_PLATFORM_LINUX)
try
{
return std::make_unique<GL::EGLLoader>(m_opengl32Lib);
return std::make_unique<GL::EGLLoader>();
}
catch (const std::exception& e)
{
@@ -84,7 +78,7 @@ namespace Nz
#ifdef NAZARA_PLATFORM_WINDOWS
try
{
return std::make_unique<GL::WGLLoader>(m_opengl32Lib);
return std::make_unique<GL::WGLLoader>();
}
catch (const std::exception& e)
{

2
src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp
View File

@@ -19,7 +19,7 @@
namespace Nz::GL
{
EGLLoader::EGLLoader(DynLib& /*openglLib*/)
EGLLoader::EGLLoader()
{
if (!m_eglLib.Load("libEGL"))
throw std::runtime_error("failed to load gdi32.dll: " + m_eglLib.GetLastError());

6
src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.cpp
View File

@@ -9,10 +9,12 @@
namespace Nz::GL
{
WGLLoader::WGLLoader(DynLib& openglLib) :
m_opengl32Lib(openglLib),
WGLLoader::WGLLoader() :
m_baseContext(nullptr, *this)
{
if (!m_opengl32Lib.Load("opengl32" NAZARA_DYNLIB_EXTENSION))
throw std::runtime_error("Failed to load opengl32 library, is OpenGL installed on your system?");
if (!m_gdi32Lib.Load("gdi32.dll"))
throw std::runtime_error("failed to load gdi32.dll: " + m_gdi32Lib.GetLastError());