From e8db0e66624b6291a15e23948a95b49c5cf3dde0 Mon Sep 17 00:00:00 2001
From: nadro <nadro@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Sat, 14 Nov 2015 16:40:11 +0000
Subject: [PATCH] - Merged revision 5183 from trunk. - Fixed support for
 Android.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Cubemap textures in OpenGL drivers
* Support for iOS
* Support for OSX
(If you need one of those features please use rev 5180)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5184 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 include/ITexture.h                     |  2 +-
 source/Irrlicht/Android/jni/Android.mk |  4 +---
 source/Irrlicht/CGUIFont.cpp           | 18 +++++++++---------
 source/Irrlicht/CGUIFont.h             |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/include/ITexture.h b/include/ITexture.h
index b9f4b8fd..a1d3261c 100644
--- a/include/ITexture.h
+++ b/include/ITexture.h
@@ -68,7 +68,7 @@ enum E_TEXTURE_CREATION_FLAG
 	//! Allow the driver to keep a copy of the texture in memory
 	/** This makes calls to ITexture::lock a lot faster, but costs main memory.
 	Default is off, except for font-texture which always enable this flag.
-	Currently only used in combination with OpenGL-ES2.	*/
+	Currently only used in combination with OpenGL drivers.	*/
 	ETCF_ALLOW_MEMORY_COPY = 0x00000080,
 
 	/** This flag is never used, it only forces the compiler to compile
diff --git a/source/Irrlicht/Android/jni/Android.mk b/source/Irrlicht/Android/jni/Android.mk
index 92142039..e68270a1 100755
--- a/source/Irrlicht/Android/jni/Android.mk
+++ b/source/Irrlicht/Android/jni/Android.mk
@@ -157,18 +157,16 @@ LOCAL_SRC_FILES := \
 					COGLES2NormalMapRenderer.cpp \
 					COGLES2ParallaxMapRenderer.cpp \
 					COGLES2Renderer2D.cpp \
-					COGLES2Texture.cpp \
 					COGLESDriver.cpp \
 					COGLESExtensionHandler.cpp \
-					COGLESTexture.cpp \
 					COgreMeshFileLoader.cpp \
+					COpenGLCacheHandler.cpp \
 					COpenGLDriver.cpp \
 					COpenGLExtensionHandler.cpp \
 					COpenGLNormalMapRenderer.cpp \
 					COpenGLParallaxMapRenderer.cpp \
 					COpenGLShaderMaterialRenderer.cpp \
 					COpenGLSLMaterialRenderer.cpp \
-					COpenGLTexture.cpp \
 					COSOperator.cpp \
 					CPakReader.cpp \
 					CParticleAnimatedMeshSceneNodeEmitter.cpp \
diff --git a/source/Irrlicht/CGUIFont.cpp b/source/Irrlicht/CGUIFont.cpp
index b5297537..d8aa5002 100644
--- a/source/Irrlicht/CGUIFont.cpp
+++ b/source/Irrlicht/CGUIFont.cpp
@@ -216,22 +216,22 @@ void CGUIFont::setMaxHeight()
 
 }
 
-void CGUIFont::pushTextureCreationFlags(bool (&flags)[3])
+void CGUIFont::pushTextureCreationFlags(bool(&flags)[3])
 {
-	flags[0] = Driver->getTextureCreationFlag ( video::ETCF_ALLOW_NON_POWER_2 );
-	flags[1] = Driver->getTextureCreationFlag ( video::ETCF_CREATE_MIP_MAPS );
-	flags[2] = Driver->getTextureCreationFlag ( video::ETCF_ALLOW_MEMORY_COPY );
+	flags[0] = Driver->getTextureCreationFlag(video::ETCF_ALLOW_NON_POWER_2);
+	flags[1] = Driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
+	flags[2] = Driver->getTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY);
 
 	Driver->setTextureCreationFlag(video::ETCF_ALLOW_NON_POWER_2, true);
-	Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false );
+	Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, false);
 	Driver->setTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY, true);
 }
 
-void CGUIFont::popTextureCreationFlags(bool (&flags)[3])
+void CGUIFont::popTextureCreationFlags(bool(&flags)[3])
 {
-	Driver->setTextureCreationFlag( video::ETCF_ALLOW_NON_POWER_2, flags[0] );
-	Driver->setTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS, flags[1] );
-	Driver->setTextureCreationFlag( video::ETCF_ALLOW_MEMORY_COPY, flags[2] );
+	Driver->setTextureCreationFlag(video::ETCF_ALLOW_NON_POWER_2, flags[0]);
+	Driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, flags[1]);
+	Driver->setTextureCreationFlag(video::ETCF_ALLOW_MEMORY_COPY, flags[2]);
 }
 
 //! loads a font file, native file needed, for texture parsing
diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h
index 4462d324..7059abfe 100644
--- a/source/Irrlicht/CGUIFont.h
+++ b/source/Irrlicht/CGUIFont.h
@@ -98,8 +98,8 @@ private:
 	s32 getAreaFromCharacter (const wchar_t c) const;
 	void setMaxHeight();
 
-	void pushTextureCreationFlags(bool (&flags)[3]);
-	void popTextureCreationFlags(bool (&flags)[3]);
+	void pushTextureCreationFlags(bool(&flags)[3]);
+	void popTextureCreationFlags(bool(&flags)[3]);
 
 	core::array<SFontArea>		Areas;
 	core::map<wchar_t, s32>		CharacterMap;