oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Disable SDL2 for 5.11.0 (#15704)

Browse source 
see #14545
This commit is contained in:
sfan5 2025-01-26 19:18:18 +01:00 • committed by GitHub
parent ffb4a5b565
commit 29cfb6efff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
irr/README.md
View file

@ -21,7 +21,7 @@ Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the
* `ENABLE_OPENGL` - Enable OpenGL driver
* `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
* `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
* `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
* `USE_SDL2` (default: ON for Android, OFF for other platforms) - Use SDL2 instead of older native device code
However, IrrlichtMt cannot be built or installed separately.

2
irr/src/CMakeLists.txt
View file

@ -1,6 +1,6 @@
# When enabling SDL2 by default on macOS, don't forget to change
# "NSHighResolutionCapable" to true in "Info.plist".
if(NOT APPLE)
if(ANDROID)
set(DEFAULT_SDL2 ON)
endif()

2
irr/src/COpenGLCoreTexture.h
View file

@ -232,7 +232,7 @@ public:
#endif
GLint max_samples = 0;
GL.GetIntegerv(GL_MAX_SAMPLES, &max_samples);
MSAA = std::min(MSAA, (u8)max_samples);
MSAA = core::min_(MSAA, (u8)max_samples);
if (use_gl_impl)
GL.TexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, MSAA, InternalFormat, Size.Width, Size.Height, GL_TRUE);