[mupen64plus-core] 95/310: Synchronize MipMapping options in Arachnoid and Rice

[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-core.

commit 42bbd959db9362b0fa933da6845dc8fc04b60d4f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 24 13:14:43 2011 +0200

    Synchronize MipMapping options in Arachnoid and Rice
---
 debian/changelog                    |  2 ++
 debian/patches/mipmapping_doc.patch | 42 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f421aa6..7a8f16a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ mupen64plus-core (1.99.4-3) UNRELEASED; urgency=low
       cached interpreter
     - Add n64_cic_nus_6105.patch, use X-Scale's PIF-CIC algorithm instead of the
       hard-coded challenge-response pairs
+    - Add mipmapping_doc.patch, Synchronize MipMapping options in Arachnoid and
+      Rice
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 13 Jul 2011 08:38:54 +0200
 
diff --git a/debian/patches/mipmapping_doc.patch b/debian/patches/mipmapping_doc.patch
new file mode 100644
index 0000000..42d3688
--- /dev/null
+++ b/debian/patches/mipmapping_doc.patch
@@ -0,0 +1,42 @@
+Description: Synchronize MipMapping options in Arachnoid and Rice
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/4b2d5d8485d2
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/doc/emuwiki-api-doc/Mupen64Plus_Plugin_Parameters.txt b/doc/emuwiki-api-doc/Mupen64Plus_Plugin_Parameters.txt
+index 2426d103435e65e6d2f5a03eae0d5dbf7bcd9efc..5b77bbf256310352c5fb7f78a50e75b9c13e1ad7 100644
+--- a/doc/emuwiki-api-doc/Mupen64Plus_Plugin_Parameters.txt
++++ b/doc/emuwiki-api-doc/Mupen64Plus_Plugin_Parameters.txt
+@@ -171,9 +171,9 @@ These are standard parameters which are used by the Mupen64Plus plugins.  The be
+ |M64TYPE_INT
+ |Enable, Disable or Force fog generation (0=Disable, 1=Enable n64 choose, 2=Force Fog)
+ |-
+-|EnableMipmaping
+-|M64TYPE_BOOL
+-|Enable/Disable Mipmaping
++|Mipmapping
++|M64TYPE_INT
++|Use Mipmapping? 0=no, 1=nearest, 2=bilinear, 3=trilinear
+ |-
+ |MultiSampling
+ |M64TYPE_INT
+@@ -191,10 +191,6 @@ These are standard parameters which are used by the Mupen64Plus plugins.  The be
+ |M64TYPE_INT
+ |Force to use texture filtering or not (0=auto: n64 choose, 1=force no filtering, 2=force filtering)
+ |-
+-|TextureFilteringMethod
+-|M64TYPE_INT
+-|Choose wich texture filtering method will be used by your graphic card (0=no filtering, 1=bilinear, 2=trilinear)
+-|-
+ |TextureQuality
+ |M64TYPE_INT
+ |Color bit depth to use for textures (0=default, 1=32 bits, 2=16 bits
+@@ -213,7 +209,7 @@ These are standard parameters which are used by the Mupen64Plus plugins.  The be
+ |-
+ |AnisotropicFiltering
+ |M64TYPE_INT
+-|Enable/Disable Anisotropic Filtering for Mipmaping (0=no filtering, 2-16=quality). This is uneffective if EnableMipmaping is false. If the given value is to high to be supported by your graphic card, the value will be the highest value your graphic card can support. Better result with Trilinear filtering
++|Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). This is uneffective if EnableMipmapping is false. If the given value is to high to be supported by your graphic card, the value will be the highest value your graphic card can support. Better result with Trilinear filtering
+ |}
+ 
+ === Input-SDL ===
diff --git a/debian/patches/series b/debian/patches/series
index 4c05f83..0686ff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ allocate_mmap.patch
 interpreter_fpu_modes.patch
 interpreter_rw_memory.patch
 n64_cic_nus_6105.patch
+mipmapping_doc.patch

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