For iOS target - defined out parts of the TGA code that use GL constants that are not defined in GLES2

Commented out an assert()  that crashes the app when the debug interface is asked to draw text at the bottom of the screen (i.e. the FPS)

--HG--
branch : nfb

KREngine/Kraken.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		104A335E1672D31C001C8BA6 /* KRCollider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 104A335C1672D31B001C8BA6 /* KRCollider.cpp */; };
 		104A335F1672D31C001C8BA6 /* KRCollider.h in Headers */ = {isa = PBXBuildFile; fileRef = 104A335D1672D31C001C8BA6 /* KRCollider.h */; settings = {ATTRIBUTES = (); }; };
 		10CC33A5168534F000BB9846 /* KRCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E48B3CBF14393E2F000C50E2 /* KRCamera.cpp */; };
+		60B07F8C187B42A8004710D4 /* KRTextureTGA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4CA10EE1637BD58005D9400 /* KRTextureTGA.cpp */; };
 		E4030E4C160A3CF000592648 /* KRStockGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = E4030E4B160A3CF000592648 /* KRStockGeometry.h */; settings = {ATTRIBUTES = (); }; };
 		E4030E4D160A3CF000592648 /* KRStockGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = E4030E4B160A3CF000592648 /* KRStockGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E404702018695DD200F01F42 /* KRTextureKTX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E404701E18695DD200F01F42 /* KRTextureKTX.cpp */; };
@@ -228,7 +229,6 @@
 		E499BF1E16AE751E007FCDBE /* KRSceneManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E46C214915364DDB009CABF3 /* KRSceneManager.h */; settings = {ATTRIBUTES = (); }; };
 		E499BF1F16AE753E007FCDBE /* KRCollider.h in Headers */ = {isa = PBXBuildFile; fileRef = 104A335D1672D31C001C8BA6 /* KRCollider.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E499BF2016AE755B007FCDBE /* KRPointLight.h in Headers */ = {isa = PBXBuildFile; fileRef = E461A157152E555400F2044A /* KRPointLight.h */; settings = {ATTRIBUTES = (); }; };
-		E499BF2116AE75A7007FCDBE /* KREngine-common.h in Headers */ = {isa = PBXBuildFile; fileRef = E46DBE841512B9E200D59F86 /* KREngine-common.h */; settings = {ATTRIBUTES = (); }; };
 		E499BF2216AE760F007FCDBE /* krengine_osx.h in Headers */ = {isa = PBXBuildFile; fileRef = E4BBBB8C1512A40300F43B5B /* krengine_osx.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		E499BF2316AE7636007FCDBE /* kraken-prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = E4BBBB8B1512A40300F43B5B /* kraken-prefix.pch */; };
 		E499BF2516AE8C20007FCDBE /* KREngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = E491016F13C99BDC0098455B /* KREngine.mm */; };
@@ -277,7 +277,6 @@
 		E4CA10EA1637BD2B005D9400 /* KRTexturePVR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4CA10E81637BD2B005D9400 /* KRTexturePVR.cpp */; };
 		E4CA10EC1637BD47005D9400 /* KRTextureTGA.h in Headers */ = {isa = PBXBuildFile; fileRef = E4CA10EB1637BD47005D9400 /* KRTextureTGA.h */; settings = {ATTRIBUTES = (); }; };
 		E4CA10ED1637BD47005D9400 /* KRTextureTGA.h in Headers */ = {isa = PBXBuildFile; fileRef = E4CA10EB1637BD47005D9400 /* KRTextureTGA.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E4CA10EF1637BD58005D9400 /* KRTextureTGA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4CA10EE1637BD58005D9400 /* KRTextureTGA.cpp */; };
 		E4CA10F01637BD58005D9400 /* KRTextureTGA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4CA10EE1637BD58005D9400 /* KRTextureTGA.cpp */; };
 		E4CA10F61638BCAF005D9400 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4CA10F51638BCAE005D9400 /* Accelerate.framework */; };
 		E4CA10F81638BCBB005D9400 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4CA10F71638BCBB005D9400 /* Accelerate.framework */; };
@@ -1308,7 +1307,6 @@
 				E499BF1B16AE747C007FCDBE /* KRVector2.h in Headers */,
 				E499BF1E16AE751E007FCDBE /* KRSceneManager.h in Headers */,
 				E499BF2016AE755B007FCDBE /* KRPointLight.h in Headers */,
-				E499BF2116AE75A7007FCDBE /* KREngine-common.h in Headers */,
 				E404702218695DD200F01F42 /* KRTextureKTX.h in Headers */,
 				E4F027D016979CE200D4427D /* KRAudioSample.h in Headers */,
 				E450273B16E0491D00FDEC5C /* KRReverbZone.h in Headers */,
@@ -1611,6 +1609,7 @@
 				E491019713C99BDC0098455B /* KRVector3.cpp in Sources */,
 				E491019813C99BDC0098455B /* KRTextureManager.cpp in Sources */,
 				E491019913C99BDC0098455B /* KRTexture2D.cpp in Sources */,
+				60B07F8C187B42A8004710D4 /* KRTextureTGA.cpp in Sources */,
 				E491019A13C99BDC0098455B /* KRMeshManager.cpp in Sources */,
 				E47C25A713F4F6AB00FF4370 /* KRShaderManager.cpp in Sources */,
 				E47C25A913F4F6DD00FF4370 /* KRShader.cpp in Sources */,
@@ -1643,7 +1642,6 @@
 				E4B175AC161F5A1000B8FB80 /* KRTexture.cpp in Sources */,
 				E4B175B2161F5FAF00B8FB80 /* KRTextureCube.cpp in Sources */,
 				E4CA10E91637BD2B005D9400 /* KRTexturePVR.cpp in Sources */,
-				E4CA10EF1637BD58005D9400 /* KRTextureTGA.cpp in Sources */,
 				E4CA11781639CC90005D9400 /* KRViewport.cpp in Sources */,
 				E4324BA816444C230043185B /* KRParticleSystem.cpp in Sources */,
 				E4324BAE16444E120043185B /* KRParticleSystemNewtonian.cpp in Sources */,

KREngine/kraken/KRTexture.cpp

@@ -79,7 +79,9 @@ void KRTexture::resize(int max_dim)
                     if(!createGLTexture(target_dim)) {
                         getContext().getTextureManager()->memoryChanged(-m_newTextureMemUsed);
                         m_newTextureMemUsed = 0;
-                        assert(false);
+//                       assert(false);
+// FINDME - assert commented out .. this crashes the app when running in the debug UI and changing 'Debug-Display' to show the framerate
+//          the FPS doesn't draw anymore either (the drop shadow draws but the text doesn't)
                     }
                 }
             }

KREngine/kraken/KRTextureTGA.cpp

@@ -76,14 +76,21 @@ bool KRTextureTGA::uploadTexture(GLenum target, int lod_max_dim, int &current_lo
     TGA_HEADER *pHeader = (TGA_HEADER *)m_pData->getStart();
     unsigned char *pData = (unsigned char *)pHeader + (long)pHeader->idlength + (long)pHeader->colourmaplength * (long)pHeader->colourmaptype + sizeof(TGA_HEADER);
 
-    
+//
+// FINDME - many of the GL constants in here are not defined in GLES2
+#ifdef TARGET_OS_IPHONE
+    GLenum base_internal_format = GL_BGRA;
+#else
     GLenum base_internal_format = pHeader->bitsperpixel == 24 ? GL_BGR : GL_BGRA;
+#endif
     
     GLenum internal_format = 0;
+    
+#ifndef TARGET_OS_IPHONE
     if(compress) {
         internal_format = pHeader->bitsperpixel == 24 ? GL_COMPRESSED_RGB_S3TC_DXT1_EXT : GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
     }
-    
+#endif
     
     if(pHeader->colourmaptype != 0) {
         m_pData->unlock();
@@ -170,6 +177,7 @@ KRTexture *KRTextureTGA::compress()
     
     GLint width = 0, height = 0, internal_format, base_internal_format;
 
+#ifndef TARGET_OS_IPHONE
     GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width));
     GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height));
     GLDEBUG(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format));
@@ -187,7 +195,6 @@ KRTexture *KRTextureTGA::compress()
             break;
     }
     
-    
     GLuint lod_level = 0;
     GLint compressed_size = 0;
     GLenum err = GL_NO_ERROR;
@@ -209,7 +216,7 @@ KRTexture *KRTextureTGA::compress()
         // err will equal GL_INVALID_VALUE when
         // assert(false); // Unexpected error
     }
-    
+#endif
     
     GLDEBUG(glBindTexture(GL_TEXTURE_2D, 0));
     getContext().getTextureManager()->selectTexture(0, NULL);