Merge remote-tracking branch 'origin/master' into x86

include/GL/glu.h

@@ -17,7 +17,7 @@
 __BEGIN_DECLS
 
 #ifndef BUILD_LIBGL
-#include <GL/gl.h>
+#include <gl.h>
 #endif
 
 #define GLU_FALSE 0

samples/multitexture_arrays/pvr-texture.c

@@ -93,12 +93,12 @@ GLuint glTextureLoadPVR(char *fname, unsigned char isMipMapped, unsigned char gl
     if(texFormat != GL_UNSIGNED_SHORT_5_6_5)
         glCompressedTexImage2DARB(GL_TEXTURE_2D,
                            0,
- 	                       texFormat,
+                           texFormat,
- 	                       texW,
+                           texW,
- 	                       texH,
+                           texH,
- 	                       0,
+                           0,
- 	                       texSize,
+                           texSize,
- 	                       TEX0);
+                           TEX0);
     else {
         fprintf(stderr, "%x\n", texFormat);
         glTexImage2D(GL_TEXTURE_2D,