summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrice Goglin <Brice.Goglin@ens-lyon.org>2007-04-21 18:00:12 +0200
committerBrice Goglin <Brice.Goglin@ens-lyon.org>2007-04-21 18:00:12 +0200
commit47c3c706e84ac34fc7af1fd8c0d74929aeb6bcaa (patch)
treeae6855864a244b1d121e26c0992fbc05054a5679
parent0d830a616cb7e71504d97f4b1c130622e10286e5 (diff)
Add 09_i915_always_enable_pixel_fog.patch
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/09_i915_always_enable_pixel_fog.patch31
-rw-r--r--debian/patches/series1
3 files changed, 33 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 86f90032852..16ffae91cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (6.5.2-5) UNRELEASED; urgency=low
* Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
(closes: #420164). Thanks to Christian Ohm.
* Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
+ * Add 09_i915_always_enable_pixel_fog.patch
-- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 20 Apr 2007 18:36:51 +0200
diff --git a/debian/patches/09_i915_always_enable_pixel_fog.patch b/debian/patches/09_i915_always_enable_pixel_fog.patch
new file mode 100644
index 00000000000..d1056487051
--- /dev/null
+++ b/debian/patches/09_i915_always_enable_pixel_fog.patch
@@ -0,0 +1,31 @@
+From: Zou Nan hai <nanhai.zou@intel.com>
+Date: Fri, 2 Feb 2007 01:35:17 +0000 (+0800)
+Subject: Fix fd.o #9686, when fall into vertex fog,
+X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=2dfb3a217f730d6783fb2ac8b73248dc682f923c
+
+ Fix fd.o #9686, when fall into vertex fog,
+ fog factors are precomputed in t_vb_fog.c compute_fog_blend_factors,
+ which is incompatible with appended fragment fog code.
+ That will make GoogleEarth display abnormally.
+ always use pixel fog.
+---
+
+--- a/src/mesa/drivers/dri/i915/i915_state.c
++++ b/src/mesa/drivers/dri/i915/i915_state.c
+@@ -611,10 +611,12 @@ void i915_update_fog( GLcontext *ctx )
+ i915->state.Ctx[I915_CTXREG_LIS5] &= ~S5_FOG_ENABLE;
+ }
+
+- if (enabled) {
+- _tnl_allow_vertex_fog( ctx, (i915->vertex_fog == I915_FOG_VERTEX) );
+- _tnl_allow_pixel_fog( ctx, (i915->vertex_fog != I915_FOG_VERTEX) );
+- }
++ /* always enbale pixel fog
++ * vertex fog use precaculted fog coord will conflict with appended
++ * fog program
++ */
++ _tnl_allow_vertex_fog( ctx, 0 );
++ _tnl_allow_pixel_fog( ctx, 1 );
+ }
+
+ static void i915Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *param)
diff --git a/debian/patches/series b/debian/patches/series
index 56f3fe8fa06..f8249980eff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
06_fix_texture_data_corruption.patch
07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
08_r300_update_window_state_when_bound_but_stamp_changed.patch
+09_i915_always_enable_pixel_fog.patch