luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-25 05:35:25 +02:00
Code Activity

Revert "Use EGL over GLX" (#15315)

Browse Source 
This reverts commit aa273119f2.
This commit is contained in:
sfan5
2024-10-24 17:52:06 +02:00
committed by GitHub
parent e441b5d240
commit 2d135cc1bb
6 changed files with 539 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
irr/src/CMakeLists.txt
View File

@@ -158,7 +158,7 @@ if(ENABLE_OPENGL)
if(DEVICE STREQUAL "WINDOWS")
add_definitions(-D_IRR_COMPILE_WITH_WGL_MANAGER_)
elseif(DEVICE STREQUAL "X11")
add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_)
add_definitions(-D_IRR_COMPILE_WITH_GLX_MANAGER_)
elseif(DEVICE STREQUAL "OSX")
add_definitions(-D_IRR_COMPILE_WITH_NSOGL_MANAGER_)
endif()
@@ -213,15 +213,7 @@ if(ENABLE_GLES2)
find_package(OpenGLES2 REQUIRED)
endif()
if(ENABLE_OPENGL)
if(DEVICE STREQUAL "X11")
# use components so we can grab EGL
find_package(OpenGL REQUIRED COMPONENTS EGL OpenGL)
set(OPENGL_LIBRARIES OpenGL::GL)
set(EGL_INCLUDE_DIR OpenGL::EGL)
set(EGL_LIBRARY OpenGL::EGL)
else()
find_package(OpenGL REQUIRED)
endif()
find_package(OpenGL REQUIRED)
endif()
if(USE_SDL2)
if(NOT ANDROID)
@@ -338,6 +330,7 @@ target_link_libraries(IRROBJ PRIVATE IRRMESHOBJ)
set(IRRDRVROBJ
CNullDriver.cpp
CGLXManager.cpp
CWGLManager.cpp
CEGLManager.cpp
CSDLManager.cpp