[mupen64plus] 158/262: Reduce flickering when enabling fog in rice

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit c006ba6721ee75ac15be2c49b5d0ffd62f3c1433
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Oct 19 23:24:21 2009 +0200

    Reduce flickering when enabling fog in rice
    
    When enabling fog in rice video plugin some polygons near the camera
    starts to flicker, turn to white or disappear completely. This happens
    due to negative fog coords send to OpenGL. This is invalid and should be
    clamped to 0.0 in that case.
---
 debian/changelog              |  7 +++++++
 debian/patches/rice_fog.patch | 22 ++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c6a8777..c9ebe45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus (1.5+dfsg1-8) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add rice_fog.patch, Reduce flickering when enabling fog in rice
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 19 Oct 2009 23:23:05 +0200
+
 mupen64plus (1.5+dfsg1-7) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/patches/rice_fog.patch b/debian/patches/rice_fog.patch
new file mode 100644
index 0000000..76cda0b
--- /dev/null
+++ b/debian/patches/rice_fog.patch
@@ -0,0 +1,22 @@
+Description: Reduce flickering when enabling fog in rice
+ When enabling fog in rice video plugin some polygons near the camera starts to
+ flicker, turn to white or disappear completely. This happens due to negative
+ fog coords send to OpenGL. This is invalid and should be clamped to 0.0 in that
+ case.
+Bug: http://code.google.com/p/mupen64plus/issues/detail?id=30
+Author: Jonathan Kleinehellefort <jk at molb.org>
+
+---
+diff --git a/rice_video/RenderBase.cpp b/rice_video/RenderBase.cpp
+index a5dcc2e716c8b5ea9c4a88bdf70815f4a2912ce4..16372271c500872abc7e9ed6fba4482ed7ce1a99 100644
+--- a/rice_video/RenderBase.cpp
++++ b/rice_video/RenderBase.cpp
+@@ -854,7 +854,7 @@ void InitVertex(uint32 dwV, uint32 vtxIndex, bool bTexture, bool openGL)
+         g_vtxProjected5[vtxIndex][1] = g_vtxTransformed[dwV].y;
+         g_vtxProjected5[vtxIndex][2] = g_vtxTransformed[dwV].z;
+         g_vtxProjected5[vtxIndex][3] = g_vtxTransformed[dwV].w;
+-        g_vtxProjected5[vtxIndex][4] = g_vecProjected[dwV].z;
++        g_vtxProjected5[vtxIndex][4] = max(0.0, g_vecProjected[dwV].z);
+ 
+         if( g_vtxTransformed[dwV].w < 0 )   g_vtxProjected5[vtxIndex][4] = 0;
+         g_vtxIndex[vtxIndex] = vtxIndex;
diff --git a/debian/patches/series b/debian/patches/series
index e25eb7a..e5febe9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ fix_r0_override.patch
 resume_on_start.patch
 osd-pause-crash.patch
 system-liblzma.patch
+rice_fog.patch

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