This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository mednafen.
commit f204d89f1f47c406eb9a5d1ab3e2ea71d816053c Author: Stephen Kitt <[email protected]> Date: Tue Sep 1 19:37:30 2015 +0200 Imported Upstream version 0.9.38.6+dfsg --- ChangeLog | 9 +++++++++ Documentation/gb.html | 2 +- Documentation/gba.html | 2 +- Documentation/gg.html | 2 +- Documentation/lynx.html | 2 +- Documentation/md.html | 2 +- Documentation/mednafen.html | 2 +- Documentation/modules.def | 2 +- Documentation/nes.html | 2 +- Documentation/netplay.html | 2 +- Documentation/ngp.html | 2 +- Documentation/pce.html | 2 +- Documentation/pce_fast.html | 2 +- Documentation/pcfx.html | 2 +- Documentation/psx.html | 2 +- Documentation/sms.html | 2 +- Documentation/snes.html | 2 +- Documentation/vb.html | 2 +- Documentation/wswan.html | 2 +- configure | 2 +- configure.ac | 2 +- src/cdrom/scsicd.cpp | 2 +- src/pce_fast/pcecd_drive.cpp | 2 +- src/psx/gpu.cpp | 4 ++-- src/psx/gpu_sprite.cpp | 29 +++++++++++++---------------- 25 files changed, 46 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 140671d..8850ed9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +-- 0.9.38.6: -- + +August 9, 2015: + PSX: Fixed a bug in the calculation of time taken by some GPU commands while in interlaced mode; fixes graphical glitches in + "Mr. Driller G". + + PCE, PCE_FAST: Added more delay to CD Read command's returning of sector data, to fix a lockup in "Mirai Shonen Conan", + and a stuck note problem in "4 in 1 Super CD". + -- 0.9.38.5: -- June 26, 2015: diff --git a/Documentation/gb.html b/Documentation/gb.html index 73e9a26..59e4614 100644 --- a/Documentation/gb.html +++ b/Documentation/gb.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Game Boy (Color) Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/gba.html b/Documentation/gba.html index 32b29e0..aa98e4c 100644 --- a/Documentation/gba.html +++ b/Documentation/gba.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Game Boy Advance Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul><li><a href="#Introduction%01BIOS">BIOS</a><ul></ul></li><li><a href="#Introduction%01Custom+Palettes">Custom Palettes</a><ul></ul></li><li><a href="#Introduction%01Backup+Memory+Type">Backup Memory Type</a><ul></ul></li></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/gg.html b/Documentation/gg.html index 4067baa..b748eb1 100644 --- a/Documentation/gg.html +++ b/Documentation/gg.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Sega Game Gear Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/lynx.html b/Documentation/lynx.html index 7bc455a..ccc8636 100644 --- a/Documentation/lynx.html +++ b/Documentation/lynx.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Atari Lynx Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/md.html b/Documentation/md.html index 5aa2e7c..1ad4d2c 100644 --- a/Documentation/md.html +++ b/Documentation/md.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Sega Genesis/MegaDrive Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/mednafen.html b/Documentation/mednafen.html index fd897d6..774a58b 100644 --- a/Documentation/mednafen.html +++ b/Documentation/mednafen.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>General Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul><li><a href="#Section_base_directory">Base Directory</a><ul></ul></li></ul></li><li><a href="#Core+Features">Core Features</a><ul><li><a href="#Section_cdrom_emulation">CD Emulation</a><ul><li><a href="#Core+Features%01CD+Emulation%01Compact+Disc+Images">Compact Disc Images</a><ul></ul></li><li><a href="#Section_multicd_games">Multiple-CD Games</a><ul></ul></li><li><a href="#Section_cdg">CD+G</a><ul></ul></li><li><a href="#Section_phot [...] diff --git a/Documentation/modules.def b/Documentation/modules.def index c7ff776..253628c 100644 --- a/Documentation/modules.def +++ b/Documentation/modules.def @@ -1,4 +1,4 @@ -0.9.38.5 +0.9.38.6 nes Nintendo Entertainment System/Famicom 256 diff --git a/Documentation/nes.html b/Documentation/nes.html index 168e472..d0cb0e8 100644 --- a/Documentation/nes.html +++ b/Documentation/nes.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Nintendo Entertainment System/Famicom Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul><li><a href="#Introduction%01Custom+Palettes">Custom Palettes</a><ul></ul></li><li><a href="#Introduction%01Input">Input</a><ul><li><a href="#Introduction%01Input%01Zapper">Zapper</a><ul></ul></li></ul></li><li><a href="#Introduction%01File+Formats">File Formats</a><ul><li><a href="#Introduction%01File+Formats%01iNES+Format">iNES Format</a><ul></ul></li><li><a href="#Introduction%01File+Formats%01UNIF">UNIF</a><ul></ul></li></ul></li>< [...] diff --git a/Documentation/netplay.html b/Documentation/netplay.html index c608617..43a1dcc 100644 --- a/Documentation/netplay.html +++ b/Documentation/netplay.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Netplay Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Setting+up+the+Server">Setting up the Server</a><ul></ul></li><li><a href="#Using+Mednafen%27s+netplay+console">Using Mednafen's netplay console</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/ngp.html b/Documentation/ngp.html index c6e24b1..bab0ce8 100644 --- a/Documentation/ngp.html +++ b/Documentation/ngp.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Neo Geo Pocket (Color) Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/pce.html b/Documentation/pce.html index a21a516..a921164 100644 --- a/Documentation/pce.html +++ b/Documentation/pce.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>PC Engine/TurboGrafx 16 (CD)/SuperGrafx Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Custom+Palettes">Custom Palettes</a><ul></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Advanced+Usage">Advanced Usage</a><ul><li><a href="#Advanced+Usage%01Accidental+Soft+Resets">Accidental Soft Resets</a><ul></ul></li><li><a href="#Advanced+Usage%01Sprite+Flickering">Sprite Flickering</a><ul></ul></li><li><a href="#Advanced+Usage%01Obnoxious+Sound+Effect [...] diff --git a/Documentation/pce_fast.html b/Documentation/pce_fast.html index 3df43c1..8b5b401 100644 --- a/Documentation/pce_fast.html +++ b/Documentation/pce_fast.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>PC Engine (CD)/TurboGrafx 16 (CD)/SuperGrafx Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/pcfx.html b/Documentation/pcfx.html index 6b11bf2..c20b565 100644 --- a/Documentation/pcfx.html +++ b/Documentation/pcfx.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>PC-FX Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Section_firmware_bios">Firmware/BIOS</a><ul></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/psx.html b/Documentation/psx.html index 4a1b6c0..e70aa79 100644 --- a/Documentation/psx.html +++ b/Documentation/psx.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Sony PlayStation Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Section_intro">Introduction</a><ul></ul></li><li><a href="#Section_firmware_bios">Firmware/BIOS</a><ul></ul></li><li><a href="#Analog+Sticks+Range+Issues">Analog Sticks Range Issues</a><ul></ul></li><li><a href="#Section_multitap">Multitap Usage</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/sms.html b/Documentation/sms.html index 42a0aff..2c0a0c3 100644 --- a/Documentation/sms.html +++ b/Documentation/sms.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Sega Master System Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/snes.html b/Documentation/snes.html index 51e5548..1b15e27 100644 --- a/Documentation/snes.html +++ b/Documentation/snes.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Super Nintendo Entertainment System/Super Famicom Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/vb.html b/Documentation/vb.html index 560ae87..5a85b0c 100644 --- a/Documentation/vb.html +++ b/Documentation/vb.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>Virtual Boy Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/Documentation/wswan.html b/Documentation/wswan.html index 19ec2b7..1602e3f 100644 --- a/Documentation/wswan.html +++ b/Documentation/wswan.html @@ -9,7 +9,7 @@ <body> <center><h1><img alt="Mednafen" src="mednafen.png" width="696" height="204"></h1></center> <center><h1>WonderSwan Documentation</h1></center> - <center><i>Last updated June 26, 2015<br>Valid as of 0.9.38.5</i></center> + <center><i>Last updated August 11, 2015<br>Valid as of 0.9.38.6</i></center> <p></p> <b>Table of Contents:</b> <ul><li><a href="#Introduction">Introduction</a><ul></ul></li><li><a href="#Default+Key+Assignments">Default Key Assignments</a><ul></ul></li><li><a href="#Game-specific+Emulation+Hacks">Game-specific Emulation Hacks</a><ul></ul></li><li><a href="#Settings+Reference">Settings Reference</a><ul></ul></li></ul><hr width="100%"> diff --git a/configure b/configure index 3fd1084..cb16c28 100755 --- a/configure +++ b/configure @@ -4332,7 +4332,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } # # Avoid trailing and leading zeroes in the decimal version components to avoid confusing not-so-learned people. # -MEDNAFEN_VERSION='0.9.38.5' +MEDNAFEN_VERSION='0.9.38.6' MEDNAFEN_VERSION_NUMERIC=0x000938 ac_aux_dir= diff --git a/configure.ac b/configure.ac index bc07e2f..61a76ef 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR([m4]) # # Avoid trailing and leading zeroes in the decimal version components to avoid confusing not-so-learned people. # -MEDNAFEN_VERSION='0.9.38.5' +MEDNAFEN_VERSION='0.9.38.6' MEDNAFEN_VERSION_NUMERIC=0x000938 AC_CANONICAL_HOST diff --git a/src/cdrom/scsicd.cpp b/src/cdrom/scsicd.cpp index 21d81e2..9e963fe 100644 --- a/src/cdrom/scsicd.cpp +++ b/src/cdrom/scsicd.cpp @@ -1928,7 +1928,7 @@ static void DoREADBase(uint32 sa, uint32 sc) { Cur_CDIF->HintReadSector(sa); //, sa + sc); - CDReadTimer = (uint64)1 * 2048 * System_Clock / CD_DATA_TRANSFER_RATE; + CDReadTimer = (uint64)((WhichSystem == SCSICD_PCE) ? 3 : 1) * 2048 * System_Clock / CD_DATA_TRANSFER_RATE; } else { diff --git a/src/pce_fast/pcecd_drive.cpp b/src/pce_fast/pcecd_drive.cpp index 8010b1d..258986c 100644 --- a/src/pce_fast/pcecd_drive.cpp +++ b/src/pce_fast/pcecd_drive.cpp @@ -472,7 +472,7 @@ static void DoREADBase(uint32 sa, uint32 sc) { Cur_CDIF->HintReadSector(sa); //, sa + sc); - CDReadTimer = (uint64)1 * 2048 * System_Clock / CD_DATA_TRANSFER_RATE; + CDReadTimer = (uint64)3 * 2048 * System_Clock / CD_DATA_TRANSFER_RATE; } else { diff --git a/src/psx/gpu.cpp b/src/psx/gpu.cpp index 3ca9dde..0593e67 100644 --- a/src/psx/gpu.cpp +++ b/src/psx/gpu.cpp @@ -351,7 +351,6 @@ INLINE void PS_GPU::Command_FBFill(const uint32 *cb) //printf("[GPU] FB Fill %d:%d w=%d, h=%d\n", destX, destY, width, height); DrawTimeAvail -= 46; // Approximate - DrawTimeAvail -= ((width * height) >> 3) + (height * 9); for(int32 y = 0; y < height; y++) { @@ -360,6 +359,8 @@ INLINE void PS_GPU::Command_FBFill(const uint32 *cb) if(LineSkipTest(d_y)) continue; + DrawTimeAvail -= (width >> 3) + 9; + for(int32 x = 0; x < width; x++) { const int32 d_x = (x + destX) & 1023; @@ -367,7 +368,6 @@ INLINE void PS_GPU::Command_FBFill(const uint32 *cb) GPURAM[d_y][d_x] = fill_value; } } - } INLINE void PS_GPU::Command_FBCopy(const uint32 *cb) diff --git a/src/psx/gpu_sprite.cpp b/src/psx/gpu_sprite.cpp index 5bb5343..9994ec4 100644 --- a/src/psx/gpu_sprite.cpp +++ b/src/psx/gpu_sprite.cpp @@ -89,22 +89,6 @@ void PS_GPU::DrawSprite(int32 x_arg, int32 y_arg, int32 w, int32 h, uint8 u_arg, if(y_bound > (ClipY1 + 1)) y_bound = ClipY1 + 1; - if(y_bound > y_start && x_bound > x_start) - { - // - // Note(TODO): From tests on a PS1, even a 0-width sprite takes up time to "draw" proportional to its height. - // - int32 suck_time = (x_bound - x_start) * (y_bound - y_start); - - if((BlendMode >= 0) || MaskEval_TA) - { - suck_time += ((((x_bound + 1) & ~1) - (x_start & ~1)) * (y_bound - y_start)) >> 1; - } - - DrawTimeAvail -= suck_time; - } - - //HeightMode && !dfe && ((y & 1) == ((DisplayFB_YStart + !field_atvs) & 1)) && !DisplayOff //printf("%d:%d, %d, %d ---- heightmode=%d displayfb_ystart=%d field_atvs=%d displayoff=%d\n", w, h, scanline, dfe, HeightMode, DisplayFB_YStart, field_atvs, DisplayOff); @@ -117,6 +101,19 @@ void PS_GPU::DrawSprite(int32 x_arg, int32 y_arg, int32 w, int32 h, uint8 u_arg, if(!LineSkipTest(y)) { + if(MDFN_LIKELY(x_bound > x_start)) + { + // + // TODO: From tests on a PS1, even a 0-width sprite takes up time to "draw" proportional to its height. + // + int32 suck_time = /*8 +*/ (x_bound - x_start); + + if((BlendMode >= 0) || MaskEval_TA) + suck_time += (((x_bound + 1) & ~1) - (x_start & ~1)) >> 1; + + DrawTimeAvail -= suck_time; + } + for(int32 x = x_start; MDFN_LIKELY(x < x_bound); x++) { if(textured) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednafen.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
