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 ffd11102c1e4f7c224218bdfda3a1271c27c5e80 Author: Sven Eckelmann <[email protected]> Date: Fri Sep 9 10:35:52 2011 +0200 Imported Upstream version 1.99.4+26+4e8c27128826 --- src/maingl.cpp | 1 - src/rdp.cpp | 2 +- src/rgl.cpp | 6 +++--- src/rgl_osdep.cpp | 4 ++++ src/rgl_rendermode.cpp | 4 ++-- src/rgl_tiles.cpp | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/maingl.cpp b/src/maingl.cpp index b17b7b8..99e87f5 100644 --- a/src/maingl.cpp +++ b/src/maingl.cpp @@ -214,7 +214,6 @@ extern "C" { return M64ERR_INCOMPATIBLE; } - CoreVideo_Init(); rglReadSettings(); return M64ERR_SUCCESS; diff --git a/src/rdp.cpp b/src/rdp.cpp index a986e6c..673522b 100644 --- a/src/rdp.cpp +++ b/src/rdp.cpp @@ -456,7 +456,7 @@ static void rdp_load_block(uint32_t w1, uint32_t w2) tl * rdpTiWidth*4 + rdpTiAddress + sl*4, 0, ~0, ~0); if (tb+width/4 > 0x1000/4) { - LOG("load_block : fixup too large width\n", width, 0x1000-tb*4); + LOG("load_block : fixup too large width\n"); width = 0x1000-tb*4; } diff --git a/src/rgl.cpp b/src/rgl.cpp index 3150a5f..275bba1 100644 --- a/src/rgl.cpp +++ b/src/rgl.cpp @@ -344,7 +344,7 @@ int rglUseTile(rglTile_t & tile, float & ds, float & dt, float & ss, float & st) ds = ss - ds; dt = st - dt; - DUMP("texture fb %x shift %g x %g (scale %g x %g) tile %d x %d (sl %d tl %d)\n", + DUMP("texture fb %p shift %g x %g (scale %g x %g) tile %d x %d (sl %d tl %d)\n", &hbuf, ds, dt, ss, st, tile.w, tile.h, tile.sl, tile.tl); } else { @@ -435,7 +435,7 @@ void rglPrepareFramebuffer(rglRenderBuffer_t & buffer) rglDeleteRenderBuffer(buffer); } - DUMP("Render buffer %x at %x --> %x\n", &buffer, + DUMP("Render buffer %p at %x --> %x\n", &buffer, buffer.addressStart, buffer.addressStop); if (!buffer.fbid) { @@ -605,7 +605,7 @@ void rglRenderChunks(int upto) if (lastBuffer != &buffer) rglPrepareFramebuffer(buffer); - DUMP("Buffer %x at %x area %d -> %d x %d -> %d\n", + DUMP("Buffer %p at %x area %d -> %d x %d -> %d\n", &buffer, buffer.addressStart, buffer.area.xh>>2, buffer.area.xl>>2, buffer.area.yh>>2, buffer.area.yl>>2); diff --git a/src/rgl_osdep.cpp b/src/rgl_osdep.cpp index 3dea9be..b387815 100644 --- a/src/rgl_osdep.cpp +++ b/src/rgl_osdep.cpp @@ -54,6 +54,10 @@ void rglSwapBuffers() int rglOpenScreen() { + if (CoreVideo_Init() != M64ERR_SUCCESS) { + rdp_log(M64MSG_ERROR, "Could not initialize video."); + return 0; + } if (rglStatus == RGL_STATUS_WINDOWED) { screen_width = rglSettings.resX; screen_height = rglSettings.resY; diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp index 651c127..e1a3332 100644 --- a/src/rgl_rendermode.cpp +++ b/src/rgl_rendermode.cpp @@ -604,7 +604,7 @@ case 0: // c break; case 1: // f LOGERROR("Unsupported src color : FRAG\n"); - LOGERROR(rglCombiner2String(state)); + LOGERROR("%s", rglCombiner2String(state)); break; case 2: // b p += sprintf( @@ -641,7 +641,7 @@ case 3: c->dstBlend = dst; } else { LOGERROR("Unsuported blender :\n"); - LOGERROR(rglCombiner2String(state)); + LOGERROR("%s", rglCombiner2String(state)); } } else diff --git a/src/rgl_tiles.cpp b/src/rgl_tiles.cpp index 8f471f9..7d31bca 100644 --- a/src/rgl_tiles.cpp +++ b/src/rgl_tiles.cpp @@ -604,7 +604,7 @@ GL_MIRROR_CLAMP_TO_EDGE_EXT : GL_MIRRORED_REPEAT; } if (packed) { - DUMP("loading texture %dx%d fmt %s size %x (%x %x %x %x)\n", tile.w, tile.h, rdpImageFormats[tile.format], tile.size, glfmt, glpixfmt, packed, ptr); + DUMP("loading texture %dx%d fmt %s size %x (%x %x %x %p)\n", tile.w, tile.h, rdpImageFormats[tile.format], tile.size, glfmt, glpixfmt, packed, ptr); // printf("cycle type = %d\n", chunk.rdpState.otherModes.cycle_type); if (!glpixfmt) glpixfmt = glfmt; -- 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
