mesa: Changes to 'debian-unstable'
debian/changelog | 9 +
debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch | 56 ++++++++++
debian/patches/08_r300_update_window_state_when_bound_but_stamp_changed.patch | 35 ++++++
debian/patches/09_i915_always_enable_pixel_fog.patch | 31 +++++
debian/patches/series | 3
5 files changed, 134 insertions(+)
New commits:
commit 47c3c706e84ac34fc7af1fd8c0d74929aeb6bcaa
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 21 18:00:12 2007 +0200
Add 09_i915_always_enable_pixel_fog.patch
diff --git a/debian/changelog b/debian/changelog
index 86f9003..16ffae9 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 0000000..d105648
--- /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 56f3fe8..f824998 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
commit 0d830a616cb7e71504d97f4b1c130622e10286e5
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Fri Apr 20 18:53:47 2007 +0200
Add 08_r300_update_window_state_when_bound_but_stamp_changed.patch
diff --git a/debian/changelog b/debian/changelog
index a1a5747..86f9003 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,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
-- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 20 Apr 2007 18:36:51 +0200
diff --git a/debian/patches/08_r300_update_window_state_when_bound_but_stamp_changed.patch b/debian/patches/08_r300_update_window_state_when_bound_but_stamp_changed.patch
new file mode 100644
index 0000000..8bf8db6
--- /dev/null
+++ b/debian/patches/08_r300_update_window_state_when_bound_but_stamp_changed.patch
@@ -0,0 +1,35 @@
+From: Michel D�¤nzer <michel@tungstengraphics.com>
+Date: Fri, 9 Mar 2007 08:43:17 +0000 (+0100)
+Subject: r300: Also update window state when it's already bound but its stamp changed.
+X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=4d9901a1cab8e0d55b1b2309cf3ffec235e53149
+
+r300: Also update window state when it's already bound but its stamp changed.
+
+And set new cliprects before deriving other state from them. This ensures
+cliprects aren't accessed after having been freed.
+
+Thanks to Panagiotis Papadakos for testing various iterations of this.
+---
+
+--- a/src/mesa/drivers/dri/r300/radeon_context.c
++++ b/src/mesa/drivers/dri/r300/radeon_context.c
+@@ -273,15 +273,15 @@ GLboolean radeonMakeCurrent(__DRIcontext
+ &radeon->vbl_seq);
+ }
+
++ radeon->dri.readable = driReadPriv;
++
+ if (radeon->dri.drawable != driDrawPriv ||
+- radeon->dri.readable != driReadPriv) {
++ radeon->lastStamp != driDrawPriv->lastStamp) {
+ radeon->dri.drawable = driDrawPriv;
+- radeon->dri.readable = driReadPriv;
+
++ radeonSetCliprects(radeon);
+ r300UpdateWindow(radeon->glCtx);
+ r300UpdateViewportOffset(radeon->glCtx);
+-
+- radeonSetCliprects(radeon);
+ }
+
+ _mesa_make_current(radeon->glCtx,
diff --git a/debian/patches/series b/debian/patches/series
index 6bb1894..56f3fe8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
05_static-nonpic.patch
06_fix_texture_data_corruption.patch
07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
+08_r300_update_window_state_when_bound_but_stamp_changed.patch
commit e219bf8338ae31ddc4f5f02e088237d6cd5555a9
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Fri Apr 20 18:44:59 2007 +0200
Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
diff --git a/debian/changelog b/debian/changelog
index c96993c..a1a5747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (6.5.2-5) UNRELEASED; urgency=low
+
+ * Add 07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
+ (closes: #420164). Thanks to Christian Ohm.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 20 Apr 2007 18:36:51 +0200
+
mesa (6.5.2-4) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch b/debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
new file mode 100644
index 0000000..08f8f70
--- /dev/null
+++ b/debian/patches/07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
@@ -0,0 +1,56 @@
+From: Michel D�¤nzer <michel@tungstengraphics.com>
+Date: Tue, 6 Mar 2007 12:22:35 +0000 (+0100)
+Subject: r300: Call radeonSetCliprects from radeonMakeCurrent.
+X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=6f9b1afc862851532e4820705c412388b497ad58
+
+r300: Call radeonSetCliprects from radeonMakeCurrent.
+
+Based on a patch by Panagiotis Papadakos.
+
+Among other things, this makes sure the framebuffer object associated with the
+drawable has the correct size when _mesa_make_current is called, so the default
+viewport is set up correctly.
+
+Also update radeon->lastStamp in radeonSetCliprects.
+---
+
+--- a/src/mesa/drivers/dri/r300/radeon_context.c
++++ b/src/mesa/drivers/dri/r300/radeon_context.c
+@@ -51,6 +51,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
+ #include "radeon_macros.h"
+ #include "radeon_reg.h"
+
++#include "radeon_state.h"
+ #include "r300_state.h"
+
+ #include "utils.h"
+@@ -279,6 +280,8 @@ GLboolean radeonMakeCurrent(__DRIcontext
+
+ r300UpdateWindow(radeon->glCtx);
+ r300UpdateViewportOffset(radeon->glCtx);
++
++ radeonSetCliprects(radeon);
+ }
+
+ _mesa_make_current(radeon->glCtx,
+--- a/src/mesa/drivers/dri/r300/radeon_lock.c
++++ b/src/mesa/drivers/dri/r300/radeon_lock.c
+@@ -90,7 +90,6 @@ static void r300RegainedLock(radeonConte
+ #else
+ radeonUpdateScissor(radeon->glCtx);
+ #endif
+- radeon->lastStamp = drawable->lastStamp;
+ }
+
+ if (sarea->ctx_owner != radeon->dri.hwContext) {
+--- a/src/mesa/drivers/dri/r300/radeon_state.c
++++ b/src/mesa/drivers/dri/r300/radeon_state.c
+@@ -185,6 +185,8 @@ void radeonSetCliprects(radeonContextPtr
+
+ if (radeon->state.scissor.enabled)
+ radeonRecalcScissorRects(radeon);
++
++ radeon->lastStamp = drawable->lastStamp;
+ }
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e4a761e..6bb1894 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
04_cleanup-osmesa-configs.patch
05_static-nonpic.patch
06_fix_texture_data_corruption.patch
+07_call_radeonSetCliprects_from_radeonMakeCurrent.patch
Reply to: