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 0cb0756b13464145f26a36f80cbd65ab7412b3e2 Author: Sven Eckelmann <[email protected]> Date: Sun Mar 11 20:06:20 2012 +0100 Imported Upstream version 1.99.4+30+daa3f1b2fe76 --- src/maingl.cpp | 6 +++--- src/rgl.h | 2 +- src/rgl_osdep.cpp | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/maingl.cpp b/src/maingl.cpp index 99e87f5..4a5feb9 100644 --- a/src/maingl.cpp +++ b/src/maingl.cpp @@ -29,13 +29,13 @@ #define PLUGIN_VERSION 0x016304 #define VIDEO_PLUGIN_API_VERSION 0x020000 #define CONFIG_API_VERSION 0x020000 -#define VIDEXT_API_VERSION 0x020000 +#define VIDEXT_API_VERSION 0x020100 #define VERSION_PRINTF_SPLIT(x) (((x) >> 16) & 0xffff), (((x) >> 8) & 0xff), ((x) & 0xff) GFX_INFO gfx; -void (*render_callback)() = NULL; +void (*render_callback)(int) = NULL; static void (*l_DebugCallback)(void *, int, const char *) = NULL; static void *l_DebugCallContext = NULL; @@ -247,7 +247,7 @@ extern "C" { return M64ERR_SUCCESS; } - EXPORT void CALL SetRenderingCallback(void (*callback)()) + EXPORT void CALL SetRenderingCallback(void (*callback)(int)) { render_callback = callback; } diff --git a/src/rgl.h b/src/rgl.h index 17409e9..6693fe9 100644 --- a/src/rgl.h +++ b/src/rgl.h @@ -68,7 +68,7 @@ struct rglSettings_t { }; extern rglSettings_t rglSettings; -extern void (*render_callback)(); +extern void (*render_callback)(int); struct rglDepthBuffer_t { uint32_t address; diff --git a/src/rgl_osdep.cpp b/src/rgl_osdep.cpp index b387815..ad2dc1f 100644 --- a/src/rgl_osdep.cpp +++ b/src/rgl_osdep.cpp @@ -46,8 +46,10 @@ int viewport_offset; void rglSwapBuffers() { + //TODO: if screenshot capabilities are ever implemented, replace the + //hard-coded 1 with a value indicating whether the screen has been redrawn if (render_callback != NULL) - render_callback(); + render_callback(1); CoreVideo_GL_SwapBuffers(); return; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
