[mupen64plus-rsp-hle] 100/167: Move zelda fixes in separate patch zelda_graphics_glitches.patch

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-rsp-hle.

commit a87920f719d5511572a7dd6bad517a97b69eb49e
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Apr 27 11:37:17 2012 +0200

    Move zelda fixes in separate patch zelda_graphics_glitches.patch
---
 debian/changelog                             |  3 ++-
 debian/patches/pokemon_stadium_sound.patch   | 22 +++---------------
 debian/patches/series                        |  1 +
 debian/patches/zelda_graphics_glitches.patch | 34 ++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c9ced2..227a3ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ mupen64plus-rsp-hle (1.99.5-2) UNRELEASED; urgency=low
 
   [ Sven Eckelmann ]
   * debian/patches:
-    - Add pokemon_stadium_sound.patch, Fix sound in pokemon statium
+    - Add pokemon_stadium_sound.patch, Fix sound in pokemon stadium
+    - Add zelda_graphics_glitches.patch, Fix graphics glitches in Zelda OOT
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 21 Mar 2012 19:45:03 +0100
 
diff --git a/debian/patches/pokemon_stadium_sound.patch b/debian/patches/pokemon_stadium_sound.patch
index 9901582..f0d0fcd 100644
--- a/debian/patches/pokemon_stadium_sound.patch
+++ b/debian/patches/pokemon_stadium_sound.patch
@@ -3,21 +3,8 @@ Author: Bobby Smiles <bobby.smiles32 at gmail.com>
 Origin: backport, https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/13894f74faa9 https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/b8ab5963bad3
 
 ---
-diff --git a/src/jpeg.c b/src/jpeg.c
-index 67f5ef489d6a9f8009484eb29a0402afc792b0b8..c51e611200322cebf03d6c6ade8e0c94613bffd0 100644
---- a/src/jpeg.c
-+++ b/src/jpeg.c
-@@ -364,7 +364,7 @@ void ps_jpg_uncompress(OSTask_t *task)
-         }
- 
-         // Texel Formatting (RGBA16)
--        offset = ps_jpg_data.pMacroBlocks + oMBsize*mb;
-+        offset = ps_jpg_data.pMacroBlocks + iMBsize*mb;
-         y_offset = 0;
-         u_offset = oMBsize/2;
- 
 diff --git a/src/main.c b/src/main.c
-index 736310a9ac32c055a96e6599efe8e094fb4c6235..c72c3422233a9b6ce0785e0b35ac87b9e091eda8 100644
+index 736310a9ac32c055a96e6599efe8e094fb4c6235..0142d781bdfd2069b71e3a786fc1a242c915c077 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -42,6 +42,53 @@ static int l_PluginInit = 0;
@@ -97,7 +84,7 @@ index 736310a9ac32c055a96e6599efe8e094fb4c6235..c72c3422233a9b6ce0785e0b35ac87b9
      for (i = 0; i < (task->data_size/4); i += 2)
      {
          inst1 = p_alist[i];
-@@ -193,140 +245,182 @@ EXPORT m64p_error CALL PluginGetVersion(m64p_plugin_type *PluginType, int *Plugi
+@@ -193,140 +245,179 @@ EXPORT m64p_error CALL PluginGetVersion(m64p_plugin_type *PluginType, int *Plugi
  
  EXPORT unsigned int CALL DoRspCycles(unsigned int Cycles)
  {
@@ -200,10 +187,7 @@ index 736310a9ac32c055a96e6599efe8e094fb4c6235..c72c3422233a9b6ce0785e0b35ac87b9
 +            {
 +                switch(sum)
 +                {
-+                case 0x278: // Zelda OOT during boot
-+                  taskdone();
-+                  return Cycles;
-+                case 0x2caa6: // Zelda OOT, Pokemon Stadium {1,2} jpg decompression
++                case 0x2caa6: // Pokemon Stadium {1,2} jpg decompression
 +                    ps_jpg_uncompress(task);
 +                    taskdone();
 +                    return Cycles;
diff --git a/debian/patches/series b/debian/patches/series
index fadda03..e5b57fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pokemon_stadium_sound.patch
+zelda_graphics_glitches.patch
diff --git a/debian/patches/zelda_graphics_glitches.patch b/debian/patches/zelda_graphics_glitches.patch
new file mode 100644
index 0000000..755bcd6
--- /dev/null
+++ b/debian/patches/zelda_graphics_glitches.patch
@@ -0,0 +1,34 @@
+Description: Readded jpeg task 278 used during Zelda OOT boot
+Author: Bobby Smiles <bobby.smiles32 at gmail.com>
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/27234e46cfe5
+
+---
+diff --git a/src/jpeg.c b/src/jpeg.c
+index 67f5ef489d6a9f8009484eb29a0402afc792b0b8..c51e611200322cebf03d6c6ade8e0c94613bffd0 100644
+--- a/src/jpeg.c
++++ b/src/jpeg.c
+@@ -364,7 +364,7 @@ void ps_jpg_uncompress(OSTask_t *task)
+         }
+ 
+         // Texel Formatting (RGBA16)
+-        offset = ps_jpg_data.pMacroBlocks + oMBsize*mb;
++        offset = ps_jpg_data.pMacroBlocks + iMBsize*mb;
+         y_offset = 0;
+         u_offset = oMBsize/2;
+ 
+diff --git a/src/main.c b/src/main.c
+index 0142d781bdfd2069b71e3a786fc1a242c915c077..c72c3422233a9b6ce0785e0b35ac87b9e091eda8 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -302,7 +302,10 @@ EXPORT unsigned int CALL DoRspCycles(unsigned int Cycles)
+             {
+                 switch(sum)
+                 {
+-                case 0x2caa6: // Pokemon Stadium {1,2} jpg decompression
++                case 0x278: // Zelda OOT during boot
++                  taskdone();
++                  return Cycles;
++                case 0x2caa6: // Zelda OOT, Pokemon Stadium {1,2} jpg decompression
+                     ps_jpg_uncompress(task);
+                     taskdone();
+                     return Cycles;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git