[mupen64plus-video-z64] 154/161: Imported Upstream version 2.0.0+13+g72af4f0
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:20:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-z64.
commit 958b71dd7970a9062f265aa4491731d56025985a
Author: Sven Eckelmann <sven at narfation.org>
Date: Tue Apr 28 22:31:49 2015 +0200
Imported Upstream version 2.0.0+13+g72af4f0
---
projects/unix/Makefile | 0
src/disasm.cpp | 3 ++-
src/glshader.cpp | 7 +++++--
src/maingl.cpp | 13 +++++++++++--
src/osal_dynamiclib_unix.c | 4 ++--
src/osal_dynamiclib_win32.c | 4 ++--
src/rdp.cpp | 5 +++--
src/rdp.h | 4 ++--
src/rgl.cpp | 9 +++++++--
src/rgl.h | 13 ++++++++-----
src/rgl_debugger.cpp | 5 +++--
src/rgl_geometry.cpp | 7 +++++--
src/rgl_glut.cpp | 3 +--
src/rgl_osdep.cpp | 7 +++++--
src/rgl_rendermode.cpp | 14 ++++++++------
src/rgl_settings.cpp | 2 ++
src/rgl_tiles.cpp | 10 ++++++++--
17 files changed, 74 insertions(+), 36 deletions(-)
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
old mode 100644
new mode 100755
diff --git a/src/disasm.cpp b/src/disasm.cpp
index 98515c5..5981b38 100644
--- a/src/disasm.cpp
+++ b/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" };
diff --git a/src/glshader.cpp b/src/glshader.cpp
index 4729945..fd70668 100644
--- a/src/glshader.cpp
+++ b/src/glshader.cpp
@@ -19,11 +19,14 @@
*
**/
-#include <stdlib.h>
+#include <glew.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+
+#include "m64p_types.h"
+#include "rdp.h"
#include "rgl_assert.h"
-#include <glew.h>
#if defined(__MACOSX__)
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
diff --git a/src/maingl.cpp b/src/maingl.cpp
index 51f0e74..4021d1f 100644
--- a/src/maingl.cpp
+++ b/src/maingl.cpp
@@ -19,10 +19,19 @@
*
**/
+#include <SDL.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "m64p_common.h"
+#include "m64p_config.h"
+#include "m64p_plugin.h"
+#include "m64p_types.h"
+#include "m64p_vidext.h"
+#include "osal_dynamiclib.h"
#include "rdp.h"
#include "rgl.h"
-#include "osal_dynamiclib.h"
-#include <SDL.h>
#define THREADED
diff --git a/src/osal_dynamiclib_unix.c b/src/osal_dynamiclib_unix.c
index b3b7ba5..8821ffc 100644
--- a/src/osal_dynamiclib_unix.c
+++ b/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"
diff --git a/src/osal_dynamiclib_win32.c b/src/osal_dynamiclib_win32.c
index 685d717..751e1b0 100644
--- a/src/osal_dynamiclib_win32.c
+++ b/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"
diff --git a/src/rdp.cpp b/src/rdp.cpp
index 673522b..cbff3cc 100644
--- a/src/rdp.cpp
+++ b/src/rdp.cpp
@@ -19,11 +19,12 @@
*
**/
+#include <string.h>
+
+#include "m64p_plugin.h"
#include "rdp.h"
#include "rgl.h"
-#include <string.h>
-
const char *rdpImageFormats[] =
{ "RGBA", "YUV", "CI", "IA", "I", "???", "???", "???" };
diff --git a/src/rdp.h b/src/rdp.h
index 606ffd0..703704c 100644
--- a/src/rdp.h
+++ b/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_config.h"
#include "m64p_plugin.h"
+#include "m64p_types.h"
#include "m64p_vidext.h"
-#include "m64p_config.h"
#define LSB_FIRST 1 // TODO : check for platform
#ifdef LSB_FIRST
diff --git a/src/rgl.cpp b/src/rgl.cpp
index 83842c1..68910b6 100644
--- a/src/rgl.cpp
+++ b/src/rgl.cpp
@@ -76,10 +76,15 @@
*
**/
+#include <SDL.h>
+#include <glew.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#include "m64p_types.h"
#include "rdp.h"
#include "rgl.h"
-
-#include <SDL.h>
+#include "rgl_assert.h"
//#define NOFBO
#define ZTEX
diff --git a/src/rgl.h b/src/rgl.h
index c15f93f..2273293 100644
--- a/src/rgl.h
+++ b/src/rgl.h
@@ -22,11 +22,13 @@
#ifndef _RGL_H_
#define _RGL_H_
+#include <glew.h>
+#include <stdint.h>
+
+#include "m64p_plugin.h"
#include "queue.h"
-#include "rgl_assert.h"
#include "rdp.h"
-
-#include <glew.h>
+#include "rgl_assert.h"
#if defined(__MACOSX__)
#include <OpenGL/gl.h>
#elif defined(__MACOS__)
@@ -39,10 +41,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)
@@ -86,6 +88,7 @@ extern rglDepthBuffer_t zBuffers[MAX_DEPTH_BUFFERS];
extern int nbZBuffers;
struct rglRenderBuffer_t;
+
struct rglDepthSection_t {
rglRenderBuffer_t * buffer;
int chunkId;
diff --git a/src/rgl_debugger.cpp b/src/rgl_debugger.cpp
index 740be9e..3d074ab 100644
--- a/src/rgl_debugger.cpp
+++ b/src/rgl_debugger.cpp
@@ -19,6 +19,8 @@
*
**/
+#include <stdio.h>
+
#include "rdp.h"
#include "rgl.h"
@@ -133,12 +135,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"
diff --git a/src/rgl_geometry.cpp b/src/rgl_geometry.cpp
index 3d77856..c789592 100644
--- a/src/rgl_geometry.cpp
+++ b/src/rgl_geometry.cpp
@@ -19,10 +19,13 @@
*
**/
+#include <SDL.h>
+#include <stdint.h>
+#include <sys/types.h>
+
#include "rdp.h"
#include "rgl.h"
-
-#include <SDL.h>
+#include "rgl_assert.h"
inline float _zscale(uint16_t z)
{
diff --git a/src/rgl_glut.cpp b/src/rgl_glut.cpp
index 0bee4fa..6aac751 100644
--- a/src/rgl_glut.cpp
+++ b/src/rgl_glut.cpp
@@ -19,9 +19,8 @@
*
**/
-#include <string.h>
-
#include <SDL.h>
+#include <string.h>
#include "rgl_glut.h"
diff --git a/src/rgl_osdep.cpp b/src/rgl_osdep.cpp
index 2f6d120..0ae8be3 100644
--- a/src/rgl_osdep.cpp
+++ b/src/rgl_osdep.cpp
@@ -19,11 +19,14 @@
*
**/
+#include <SDL.h>
+#include <stddef.h>
+
+#include "m64p_types.h"
+#include "m64p_vidext.h"
#include "rdp.h"
#include "rgl.h"
-#include <SDL.h>
-
SDL_Surface *sdl_Screen;
int viewportOffset;
diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp
index c85a63c..f4d3d3e 100644
--- a/src/rgl_rendermode.cpp
+++ b/src/rgl_rendermode.cpp
@@ -19,10 +19,16 @@
*
**/
+#include <SDL.h>
+#include <glew.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "glshader.h"
#include "rdp.h"
#include "rgl.h"
-
-#include <SDL.h>
+#include "rgl_assert.h"
void rglRenderMode(rglRenderChunk_t & chunk)
{
@@ -670,10 +676,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"
diff --git a/src/rgl_settings.cpp b/src/rgl_settings.cpp
index 65d9ea4..9c5c68e 100644
--- a/src/rgl_settings.cpp
+++ b/src/rgl_settings.cpp
@@ -19,6 +19,8 @@
*
**/
+#include "m64p_config.h"
+#include "m64p_types.h"
#include "rdp.h"
#include "rgl.h"
diff --git a/src/rgl_tiles.cpp b/src/rgl_tiles.cpp
index bca1554..a77c943 100644
--- a/src/rgl_tiles.cpp
+++ b/src/rgl_tiles.cpp
@@ -19,10 +19,16 @@
*
**/
+#include <SDL.h>
+#include <glew.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "m64p_plugin.h"
+#include "queue.h"
#include "rdp.h"
#include "rgl.h"
-
-#include <SDL.h>
+#include "rgl_assert.h"
rglTextureHead_t freeTextures;
rglTextureHead_t texturesByCrc[256];
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git
More information about the Pkg-games-commits
mailing list