Sort the includes based on type and names

src/disasm.cpp

@@ -19,9 +19,10 @@
  *
 **/
 
-#include "z64.h"
 #include <stdio.h>
 
+#include "z64.h"
+
 static const char *image_format[] = { "RGBA", "YUV", "CI", "IA", "I", "???", "???", "???" };
 static const char *image_size[] = { "4-bit", "8-bit", "16-bit", "32-bit" };
 

src/glshader.cpp

@@ -19,11 +19,12 @@
  *
 **/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "rgl_assert.h"
 #include <glew.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "rgl_assert.h"
 #if defined(__MACOSX__)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>

src/maingl.cpp

@@ -19,10 +19,11 @@
  *
 **/
 
+#include <SDL.h>
+
+#include "osal_dynamiclib.h"
 #include "rdp.h"
 #include "rgl.h"
-#include "osal_dynamiclib.h"
-#include <SDL.h>
 
 #define THREADED
 

src/osal_dynamiclib_unix.c

@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"

src/osal_dynamiclib_win32.c

@@ -19,9 +19,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <windows.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
 
 #include "m64p_types.h"
 #include "osal_dynamiclib.h"

src/rdp.cpp

@@ -19,11 +19,11 @@
  *
 **/
 
+#include <string.h>
+
 #include "rdp.h"
 #include "rgl.h"
 
-#include <string.h>
-
 const char *rdpImageFormats[] =
 { "RGBA", "YUV", "CI", "IA", "I", "???", "???", "???" };
 

src/rdp.h

@@ -28,11 +28,11 @@
 #include <string.h>
 
 #define M64P_PLUGIN_PROTOTYPES 1
-#include "m64p_types.h"
 #include "m64p_common.h"
-#include "m64p_plugin.h"
-#include "m64p_vidext.h"
 #include "m64p_config.h"
+#include "m64p_plugin.h"
+#include "m64p_types.h"
+#include "m64p_vidext.h"
 
 #define LSB_FIRST 1 // TODO : check for platform
 #ifdef LSB_FIRST

src/rgl.cpp

@@ -76,11 +76,11 @@
  *
 **/
 
+#include <SDL.h>
+
 #include "rdp.h"
 #include "rgl.h"
 
-#include <SDL.h>
-
 //#define NOFBO
 #define ZTEX
 #define FBORGBA

src/rgl.h

@@ -22,11 +22,11 @@
 #ifndef _RGL_H_
 #define _RGL_H_
 
-#include "queue.h"
-#include "rgl_assert.h"
-#include "rdp.h"
-
 #include <glew.h>
+
+#include "queue.h"
+#include "rdp.h"
+#include "rgl_assert.h"
 #if defined(__MACOSX__)
 #include <OpenGL/gl.h>
 #elif defined(__MACOS__)
@@ -39,10 +39,10 @@
 //#include <IL/il.h>
 #endif
 
-#include "glshader.h"
-
 #include <limits.h> //for PATH_MAX
 
+#include "glshader.h"
+
 #define DWORD unsigned int
 extern GFX_INFO gfx;
 #define rdram ((uint32_t*)gfx.RDRAM)

src/rgl_debugger.cpp

@@ -133,12 +133,11 @@ char * rglCombiner2String(rdpState_t & state)
 
 #ifdef RDP_DEBUG
 
+#include <FTGLTextureFont.h>
 #include <SDL.h>
 //#include <IL/il.h>
 #include <assert.h>
 
-#include <FTGLTextureFont.h>
-
 #define FONT "LucidaTypewriterRegular.ttf"
 #define SMALLFONT "LucidaTypewriterRegular.ttf"
 //#define SMALLFONT "/usr/share/fonts/corefonts/arial.ttf"

src/rgl_geometry.cpp

@@ -19,11 +19,11 @@
  *
 **/
 
+#include <SDL.h>
+
 #include "rdp.h"
 #include "rgl.h"
 
-#include <SDL.h>
-
 inline float _zscale(uint16_t z)
 {
     uint32_t res;

src/rgl_glut.cpp

@@ -19,9 +19,8 @@
  *
 **/
 
-#include <string.h>
-
 #include <SDL.h>
+#include <string.h>
 
 #include "rgl_glut.h"
 

src/rgl_osdep.cpp

@@ -19,11 +19,11 @@
  *
 **/
 
+#include <SDL.h>
+
 #include "rdp.h"
 #include "rgl.h"
 
-#include <SDL.h>
-
 SDL_Surface *sdl_Screen;
 int viewportOffset;
 

src/rgl_rendermode.cpp

@@ -19,11 +19,11 @@
  *
 **/
 
+#include <SDL.h>
+
 #include "rdp.h"
 #include "rgl.h"
 
-#include <SDL.h>
-
 void rglRenderMode(rglRenderChunk_t & chunk)
 {
     //int i;
@@ -670,10 +670,6 @@ case 3:
 
     rglAssert(p < src+sizeof(src));
 
-#ifdef RGL_EXACT_BLEND
-    //printf("Creating combiner : \n%s", src);
-#endif
-
     c->shader = rglCreateShader(
         "void main()                                                    \n"
         "{                                                              \n"

src/rgl_tiles.cpp

@@ -19,11 +19,11 @@
  *
 **/
 
+#include <SDL.h>
+
 #include "rdp.h"
 #include "rgl.h"
 
-#include <SDL.h>
-
 rglTextureHead_t freeTextures;
 rglTextureHead_t texturesByCrc[256];
 rglTextureHead_t texturesByUsage;