diff -Nru /tmp/JCihV8lI78/mesa-6.5.2/debian/changelog /tmp/w3Y2FoJgcu/mesa-6.5.2/debian/changelog --- /tmp/JCihV8lI78/mesa-6.5.2/debian/changelog 2007-03-16 10:46:13.000000000 +0000 +++ /tmp/w3Y2FoJgcu/mesa-6.5.2/debian/changelog 2007-03-16 10:46:16.000000000 +0000 @@ -1,3 +1,11 @@ +mesa (6.5.2-3ubuntu2) feisty; urgency=low + + * debian/patches/103_ubuntu_fd.org-9686-fog.patch to fix + broken fog handling visible under Google Earth. + (Closes LP: #90622) + + -- Paul Sladen Fri, 16 Mar 2007 09:24:15 +0000 + mesa (6.5.2-3ubuntu1) feisty; urgency=low * debian/control: diff -Nru /tmp/JCihV8lI78/mesa-6.5.2/debian/patches/103_ubuntu_fd.org-9686-fog.patch /tmp/w3Y2FoJgcu/mesa-6.5.2/debian/patches/103_ubuntu_fd.org-9686-fog.patch --- /tmp/JCihV8lI78/mesa-6.5.2/debian/patches/103_ubuntu_fd.org-9686-fog.patch 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/w3Y2FoJgcu/mesa-6.5.2/debian/patches/103_ubuntu_fd.org-9686-fog.patch 2007-03-16 10:46:16.000000000 +0000 @@ -0,0 +1,31 @@ +From: Zou Nan hai +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 -Nru /tmp/JCihV8lI78/mesa-6.5.2/debian/patches/series /tmp/w3Y2FoJgcu/mesa-6.5.2/debian/patches/series --- /tmp/JCihV8lI78/mesa-6.5.2/debian/patches/series 2007-03-16 10:46:13.000000000 +0000 +++ /tmp/w3Y2FoJgcu/mesa-6.5.2/debian/patches/series 2007-03-16 10:46:16.000000000 +0000 @@ -6,3 +6,4 @@ 05_static-nonpic.patch 101_ubuntu_hidden_glname.patch 102_ubuntu_no_glw.patch +103_ubuntu_fd.org-9686-fog.patch