This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-glide64.
commit edc4c46cb763eb57d798076b3b3e747bd98bd306 Author: Sven Eckelmann <[email protected]> Date: Fri Sep 9 10:32:52 2011 +0200 Imported Upstream version 1.99.4+31+53ab44c26168 --- src/Gfx1.3.h | 2 +- src/Main.cpp | 8 +++++++- src/wrapper/combiner.cpp | 18 +++++++++--------- src/wrapper/main.cpp | 4 ++-- src/wrapper/textures.cpp | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/Gfx1.3.h b/src/Gfx1.3.h index e76d54a..8888834 100755 --- a/src/Gfx1.3.h +++ b/src/Gfx1.3.h @@ -233,7 +233,7 @@ extern __int64 perf_next; extern std::ofstream loga; #define LOG(x) loga.open("log.txt",ios::app); loga << x; loga.flush(); loga.close(); #else -#define LOG(x) WriteLog(M64MSG_VERBOSE, x); +#define LOG(x) WriteLog(M64MSG_VERBOSE, "%s", x); #endif diff --git a/src/Main.cpp b/src/Main.cpp index 0e5f505..32dfddc 100755 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1011,7 +1011,6 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con if (configDir) { SetConfigDir(configDir); - CoreVideo_Init(); ReadSettings(); return M64ERR_SUCCESS; } @@ -1370,6 +1369,7 @@ EXPORT void CALL RomClosed (void) romopen = FALSE; if (fullscreen && evoodoo) ReleaseGfx (); + CoreVideo_Quit(); } BOOL no_dlist = TRUE; @@ -1384,6 +1384,12 @@ output: none EXPORT int CALL RomOpen (void) { LOG ("RomOpen ()\n"); + if (CoreVideo_Init() != M64ERR_SUCCESS) + { + WriteLog(M64MSG_ERROR, "Could not initialize video!"); + return false; + } + no_dlist = TRUE; romopen = TRUE; ucode_error_report = TRUE; // allowed to report ucode errors diff --git a/src/wrapper/combiner.cpp b/src/wrapper/combiner.cpp index 6f2f189..484a880 100644 --- a/src/wrapper/combiner.cpp +++ b/src/wrapper/combiner.cpp @@ -371,11 +371,11 @@ void init_combiner() if(!log_length) { glGetInfoLogARB(fragment_shader_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); glGetInfoLogARB(vertex_shader_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); glGetInfoLogARB(program_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); } texture0_location = glGetUniformLocationARB(program_object, "texture0"); @@ -421,11 +421,11 @@ void init_combiner() if(!log_length) { glGetInfoLogARB(fragment_shader_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); glGetInfoLogARB(vertex_shader_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); glGetInfoLogARB(program_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); } texture0_location = glGetUniformLocationARB(program_object, "texture0"); @@ -661,12 +661,12 @@ void compile_shader() { glGetInfoLogARB(shader_programs[number_of_programs].fragment_shader_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); glGetInfoLogARB(vertex_shader_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); glGetInfoLogARB(program_object, 2048, &log_length, shader_log); - if(log_length) display_warning(shader_log); + if(log_length) display_warning("%s", shader_log); } texture0_location = glGetUniformLocationARB(program_object, "texture0"); diff --git a/src/wrapper/main.cpp b/src/wrapper/main.cpp index bbffe11..12da5cb 100755 --- a/src/wrapper/main.cpp +++ b/src/wrapper/main.cpp @@ -230,7 +230,7 @@ void display_warning(const char *text, ...) vsprintf((char*)buf, (char*)text, ap); va_end(ap); - WriteLog(M64MSG_WARNING, buf); + WriteLog(M64MSG_WARNING, "%s", buf); first_message--; } } @@ -1283,7 +1283,7 @@ void updateTexture() // nothing changed, don't update the texture if (!buffer_cleared) { - WriteLog(M64MSG_VERBOSE, "update cancelled\n", pBufferAddress); + WriteLog(M64MSG_VERBOSE, "update cancelled\n"); return; } diff --git a/src/wrapper/textures.cpp b/src/wrapper/textures.cpp index bee4431..9ae934a 100644 --- a/src/wrapper/textures.cpp +++ b/src/wrapper/textures.cpp @@ -642,7 +642,7 @@ grTexDetailControl( float detail_max ) { - WriteLog(M64MSG_VERBOSE, "grTexDetailControl(%d,%d,%d,%d)\r\n", tmu, lod_bias, detail_scale, detail_max); + WriteLog(M64MSG_VERBOSE, "grTexDetailControl(%d,%d,%d,%f)\r\n", tmu, lod_bias, detail_scale, detail_max); if (lod_bias != 31 && detail_scale != 7) { if (!lod_bias && !detail_scale && !detail_max) return; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
