BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Make it possible again to enable ES1 on Linux.

Browse Source 
Seems Debian 11 adds it back.
Thanks @TheBrokenRail for patch.
Hidden in comments for patch #322: https://sourceforge.net/p/irrlicht/patches/322


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6175 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2020-12-22 21:14:45 +00:00
parent fa0b1cb509
commit 124cc0be1e
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/IrrCompileConfig.h
View File

@ -227,22 +227,24 @@ define out. */
#endif #endif
#endif #endif
// Debian 10 removed support for GLES1 in mesa.
// Can't tell about other Linux platforms or a way to test if it's still available,
// so removing OGLES1 support on Linux now to allow compiling to work by default.
#if defined(_IRR_LINUX_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_)
#define NO_IRR_COMPILE_WITH_OGLES1_
#endif
//! Define _IRR_COMPILE_WITH_OGLES1_ to compile the Irrlicht engine with OpenGL ES 1.1. //! Define _IRR_COMPILE_WITH_OGLES1_ to compile the Irrlicht engine with OpenGL ES 1.1.
/** If you do not wish the engine to be compiled with OpenGL ES 1.1, comment this /** If you do not wish the engine to be compiled with OpenGL ES 1.1, comment this
define out. */ define out.
Currently only enabled on Android by default.
Depending on platform you may have to enable _IRR_OGLES1_USE_KHRONOS_API_HEADERS_ as well when using it.
*/
#if defined(_IRR_ANDROID_PLATFORM_)
#define _IRR_COMPILE_WITH_OGLES1_ #define _IRR_COMPILE_WITH_OGLES1_
#endif
#ifdef NO_IRR_COMPILE_WITH_OGLES1_ #ifdef NO_IRR_COMPILE_WITH_OGLES1_
#undef _IRR_COMPILE_WITH_OGLES1_ #undef _IRR_COMPILE_WITH_OGLES1_
#endif #endif
#ifdef _IRR_COMPILE_WITH_OGLES1_
//! Define _IRR_OGLES1_USE_KHRONOS_API_HEADERS_ to use the OpenGL ES headers from the Debian Khronos-api package
//#define _IRR_OGLES1_USE_KHRONOS_API_HEADERS_
#endif
//! Define required options for OpenGL ES 1.1 drivers. //! Define required options for OpenGL ES 1.1 drivers.
#if defined(_IRR_COMPILE_WITH_OGLES1_) #if defined(_IRR_COMPILE_WITH_OGLES1_)
#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) #if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_)

10
source/Irrlicht/COGLESCommon.h
View File

@ -12,14 +12,14 @@
#if defined(_IRR_COMPILE_WITH_IOS_DEVICE_) #if defined(_IRR_COMPILE_WITH_IOS_DEVICE_)
#include <OpenGLES/ES1/gl.h> #include <OpenGLES/ES1/gl.h>
#include <OpenGLES/ES1/glext.h> #include <OpenGLES/ES1/glext.h>
#elif defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) #elif defined(_IRR_OGLES1_USE_KHRONOS_API_HEADERS_)
#include <GLES/gl.h>
#include <GLES/glext.h>
#include <EGL/eglplatform.h>
#else
#include <khronos-api/GLES/gl.h> #include <khronos-api/GLES/gl.h>
#include <EGL/eglplatform.h> #include <EGL/eglplatform.h>
typedef char GLchar; typedef char GLchar;
#else // or only when defined(_IRR_COMPILE_WITH_ANDROID_DEVICE_) ?
#include <GLES/gl.h>
#include <GLES/glext.h>
#include <EGL/eglplatform.h>
#if defined(_IRR_OGLES1_USE_EXTPOINTER_) #if defined(_IRR_OGLES1_USE_EXTPOINTER_)
#include "gles-ext.h" #include "gles-ext.h"
#endif #endif