debian/changelog | 12 +++++++++---
src/mesa/drivers/dri/r300/radeon_lock.c | 4 +++-
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit e1b0715dd6326033b15b6dd2bb2fcbcfdb950df9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon May 21 11:35:28 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index e896ce9..154f99a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ mesa (6.5.3-1) experimental; urgency=low
* Cherry-pick commit 65faf023679988f93da82b4c7ebdc689f2094459 by Michel
Dänzer to fix r300 crash.
- -- Julien Cristau <[EMAIL PROTECTED]> Wed, 09 May 2007 15:02:12 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 21 May 2007 11:34:51 +0200
mesa (6.5.3~rc3-1) experimental; urgency=low
commit 1865ef6fd460a5bb6c17cb30d2b4e4c95fe144b5
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri May 18 13:36:42 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 16ffae9..53935bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-mesa (6.5.2-5) UNRELEASED; urgency=low
+mesa (6.5.2-5) unstable; urgency=low
+ [ Brice Goglin ]
* 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 <[EMAIL PROTECTED]> Fri, 20 Apr 2007 18:36:51 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 18 May 2007 13:36:25 +0200
mesa (6.5.2-4) unstable; urgency=low
commit a8c856d43c1594953a725f63e9c24d5bb658efda
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed May 9 15:09:12 2007 +0200
Cherry-pick commmit 65faf023 by Michel Dänzer to fix r300 crash.
r300: Don't crash in radeonUpdatePageFlipping when
!radeon->glCtx->DrawBuffer.
This feels like a kludge, maybe there's a better solution.
diff --git a/debian/changelog b/debian/changelog
index 8194160..80b4df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
mesa (6.5.3-1) experimental; urgency=low
+ [ David Nusinow ]
* New upstream release
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 29 Apr 2007 23:23:06 -0400
+ [ Julien Cristau ]
+ * Cherry-pick commit 65faf023679988f93da82b4c7ebdc689f2094459 by Michel
+ Dänzer to fix r300 crash.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 09 May 2007 15:02:12 +0200
mesa (6.5.3~rc3-1) experimental; urgency=low
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c
b/src/mesa/drivers/dri/r300/radeon_lock.c
index ec501c3..a5f6ec7 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -59,7 +59,9 @@ static void radeonUpdatePageFlipping(radeonContextPtr radeon)
driFlipRenderbuffers(radeon->glCtx->WinSysDrawBuffer,
radeon->sarea->pfCurrentPage);
}
- use_back = (radeon->glCtx->DrawBuffer->_ColorDrawBufferMask[0] ==
BUFFER_BIT_BACK_LEFT);
+ use_back = radeon->glCtx->DrawBuffer ?
+ (radeon->glCtx->DrawBuffer->_ColorDrawBufferMask[0] ==
+ BUFFER_BIT_BACK_LEFT) : 1;
use_back ^= (radeon->sarea->pfCurrentPage == 1);
if (use_back) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
