Minor Fixes

Author: scottrules44

librtt/Renderer/Rtt_GLTexture.cpp

@@ -27,10 +27,6 @@
 	#define DEBUG_PRINT( ... )
 #endif
 
-#if !defined(Rtt_OPENGLES) && !defined(GL_ABGR_EXT)
-#define GL_ABGR_EXT 0x8000
-#endif
-
 // ----------------------------------------------------------------------------
 
 namespace /*anonymous*/ 
@@ -54,7 +50,13 @@ namespace /*anonymous*/
 #elif !defined( Rtt_OPENGLES )
 			case Texture::kARGB:		internalFormat = GL_RGBA8;		sourceFormat = GL_BGRA;			sourceType = GL_UNSIGNED_INT_8_8_8_8_REV; break;
 			case Texture::kBGRA:		internalFormat = GL_RGBA8;		sourceFormat = GL_BGRA;			sourceType = GL_UNSIGNED_INT_8_8_8_8; break;
-			case Texture::kABGR:		internalFormat = GL_ABGR_EXT;	sourceFormat = GL_ABGR_EXT;		sourceType = GL_UNSIGNED_BYTE; break;
+            #ifdef GL_ABGR_EXT
+            case Texture::kABGR:
+                internalFormat = GL_ABGR_EXT;
+                sourceFormat = GL_ABGR_EXT;
+                sourceType = GL_UNSIGNED_BYTE;
+                break;
+            #endif
 #else
 			// NOTE: These are not available on OpenGL-ES
 			// case Texture::kARGB:		internalFormat = GL_RGBA;		sourceFormat = GL_RGBA;			sourceType = GL_UNSIGNED_BYTE; break;
@@ -119,12 +121,15 @@ GLint CalculateOptimalAlignment(U32 width, GLenum format)
             bytesPerPixel = 3;
             break;
 
-        case GL_RGBA:
-        case GL_BGRA_EXT:
+        
+        #if defined(GL_ABGR_EXT)
         case GL_ABGR_EXT:
+        #endif
+        case GL_RGBA:
             bytesPerPixel = 4;
             break;
 
+        case GL_ABGR_EXT:
 #ifdef Rtt_NXS_ENV
         case GL_LUMINANCE_ALPHA:
             bytesPerPixel = 2;