oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00
Code Wiki Activity

Delete OpenGL ES 1.0 driver (#15067)

Browse source
This commit is contained in:
sfan5 2024-08-28 20:44:42 +02:00 • committed by GitHub
parent 1298d6c020
commit bf4d31227b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 11 additions and 3453 deletions
Download patch file Download diff file Expand all files Collapse all files

31
irr/src/CMakeLists.txt
View file

@ -130,12 +130,6 @@ else()
option(ENABLE_OPENGL "Enable OpenGL" TRUE)
endif()
if(USE_SDL2 OR EMSCRIPTEN OR APPLE)
set(ENABLE_GLES1 FALSE)
else()
option(ENABLE_GLES1 "Enable OpenGL ES" FALSE)
endif()
if(APPLE)
set(ENABLE_GLES2 FALSE)
set(ENABLE_WEBGL1 FALSE)
@ -172,14 +166,6 @@ if(ENABLE_OPENGL3)
endif()
endif()
if(ENABLE_GLES1)
add_definitions(-D_IRR_COMPILE_WITH_OGLES1_)
set(OPENGLES_DIRECT_LINK TRUE)
if(DEVICE MATCHES "^(WINDOWS|X11)$")
add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_)
endif()
endif()
if(ENABLE_GLES2)
add_definitions(-D_IRR_COMPILE_WITH_OGLES2_)
if(DEVICE MATCHES "^(WINDOWS|X11)$" OR EMSCRIPTEN)
@ -204,7 +190,6 @@ endif()
message(STATUS "Device: ${DEVICE}")
message(STATUS "OpenGL: ${ENABLE_OPENGL}")
message(STATUS "OpenGL 3: ${ENABLE_OPENGL3}")
message(STATUS "OpenGL ES: ${ENABLE_GLES1}")
if (ENABLE_GLES2)
message(STATUS "OpenGL ES 2: ON (unified)")
else()
@ -220,13 +205,6 @@ find_package(ZLIB REQUIRED)
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
if(ENABLE_GLES1)
# only tested on Android, probably works on Linux (is this needed anywhere else?)
find_library(OPENGLES_LIBRARY NAMES GLESv1_CM REQUIRED)
find_library(EGL_LIBRARY NAMES EGL REQUIRED)
message(STATUS "Found OpenGLES: ${OPENGLES_LIBRARY}")
endif()
if(ENABLE_GLES2)
find_package(OpenGLES2 REQUIRED)
endif()
@ -360,14 +338,6 @@ if(ENABLE_OPENGL)
)
endif()
if(ENABLE_GLES1)
set(IRRDRVROBJ
${IRRDRVROBJ}
COGLESDriver.cpp
COGLESExtensionHandler.cpp
)
endif()
# the unified drivers
if(ENABLE_OPENGL3 OR ENABLE_GLES2)
@ -509,7 +479,6 @@ target_link_libraries(IrrlichtMt PRIVATE
"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
"$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>"
"$<$<BOOL:${OPENGLES_DIRECT_LINK}>:${OPENGLES_LIBRARY}>"
${EGL_LIBRARY}
# incl. transitive SDL2 dependencies for static linking