luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-21 00:45:23 +01:00
Code Activity

Reapply "Prefer GL3 driver over legacy GL driver"

Browse Source 
This reverts commit 0fa56a9f7c.
This commit is contained in:
sfan5
2025-11-14 20:04:54 +01:00
parent 37c3c89b03
commit bf01cdf823
6 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
irr/README.md
View File

@@ -12,12 +12,12 @@ The build system is CMake.
The following libraries are required to be installed:
* zlib, libPNG, libJPEG
* OpenGL
* or on mobile: OpenGL ES (can be optionally enabled on desktop too)
* OpenGL or OpenGL ES
* a headless build is possible, but not very useful
* SDL2 or SDL3 (see below)
Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the following options are available:
* `ENABLE_OPENGL` - Enable OpenGL driver
* `ENABLE_OPENGL` - Enable legacy OpenGL driver
* `ENABLE_OPENGL3` - Enable OpenGL 3+ driver
* `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
* `USE_SDL3` (default: `OFF`) - Use the SDL3 device instead of SDL2 (**experimental**)

12
irr/src/CMakeLists.txt
View File

@@ -104,7 +104,7 @@ option(ENABLE_OPENGL3 "Enable OpenGL 3+" ${DEFAULT_OPENGL3})
if(ANDROID OR EMSCRIPTEN)
set(ENABLE_OPENGL FALSE)
else()
option(ENABLE_OPENGL "Enable OpenGL" TRUE)
option(ENABLE_OPENGL "Enable legacy OpenGL" TRUE)
endif()
if(APPLE)
@@ -148,13 +148,9 @@ endif()
# Configuration report
message(STATUS "OpenGL: ${ENABLE_OPENGL}")
message(STATUS "OpenGL (legacy): ${ENABLE_OPENGL}")
message(STATUS "OpenGL 3: ${ENABLE_OPENGL3}")
if (ENABLE_GLES2)
message(STATUS "OpenGL ES 2: ON (unified)")
else()
message(STATUS "OpenGL ES 2: OFF")
endif()
message(STATUS "OpenGL ES 2: ${ENABLE_GLES2}")
#message(STATUS "WebGL: ${ENABLE_WEBGL1}")
# Required libs
@@ -297,7 +293,7 @@ set(IRRDRVROBJ
mt_opengl_loader.cpp
)
# the two legacy drivers
# the legacy driver
if(ENABLE_OPENGL)
set(IRRDRVROBJ