mesa: Changes to 'ubuntu'
ChangeLog | 495 ++++++++++++++++++
Makefile | 2
debian/changelog | 17
debian/control | 4
docs/news.html | 9
docs/relnotes-7.7.1.html | 24
src/gallium/auxiliary/util/u_debug.c | 51 +
src/gallium/drivers/softpipe/sp_tile_cache.c | 7
src/gallium/drivers/svga/svga_context.c | 5
src/gallium/drivers/svga/svga_state_rss.c | 13
src/gallium/drivers/svga/svga_winsys.h | 3
src/gallium/state_trackers/dri/dri_screen.c | 91 +--
src/gallium/state_trackers/xorg/xorg_crtc.c | 24
src/gallium/state_trackers/xorg/xorg_dri2.c | 14
src/gallium/state_trackers/xorg/xorg_driver.c | 94 ++-
src/gallium/state_trackers/xorg/xorg_exa.c | 3
src/gallium/state_trackers/xorg/xorg_renderer.c | 2
src/gallium/state_trackers/xorg/xorg_renderer.h | 2
src/gallium/state_trackers/xorg/xorg_tracker.h | 13
src/gallium/state_trackers/xorg/xorg_xv.c | 14
src/gallium/winsys/drm/vmware/core/vmw_context.c | 20
src/gallium/winsys/drm/vmware/core/vmw_context.h | 3
src/gallium/winsys/drm/vmware/core/vmw_screen.c | 10
src/gallium/winsys/drm/vmware/core/vmw_screen.h | 12
src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c | 2
src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c | 6
src/gallium/winsys/drm/vmware/xorg/vmw_screen.c | 46 +
src/glx/x11/glx_pbuffer.c | 3
src/glx/x11/indirect_vertex_array.c | 3
src/mesa/drivers/dri/i915/intel_tris.c | 4
src/mesa/drivers/dri/intel/intel_reg.h | 4
src/mesa/drivers/dri/r200/r200_cmdbuf.c | 3
src/mesa/drivers/dri/r200/r200_tcl.c | 56 +-
src/mesa/drivers/dri/r300/r300_state.c | 21
src/mesa/drivers/dri/r600/r600_context.c | 9
src/mesa/drivers/dri/r600/r600_texstate.c | 28 -
src/mesa/drivers/dri/r600/r700_render.c | 18
src/mesa/drivers/dri/r600/r700_state.c | 6
src/mesa/drivers/dri/radeon/radeon_chipset.h | 1
src/mesa/drivers/dri/radeon/radeon_screen.c | 1
src/mesa/drivers/dri/swrast/swrast_span.c | 2
src/mesa/drivers/dri/swrast/swrast_spantemp.h | 17
src/mesa/main/extensions.c | 15
src/mesa/main/hash.c | 36 -
src/mesa/main/renderbuffer.c | 3
src/mesa/main/texrender.c | 5
src/mesa/main/version.h | 2
src/mesa/state_tracker/st_cb_drawpixels.c | 29 -
src/mesa/state_tracker/st_cb_fbo.c | 5
src/mesa/state_tracker/st_cb_texture.c | 2
src/mesa/state_tracker/st_framebuffer.c | 53 -
src/mesa/state_tracker/st_public.h | 3
src/mesa/vbo/vbo_split_copy.c | 2
53 files changed, 1059 insertions(+), 258 deletions(-)
New commits:
commit daf5b5aa08aa40cfd0951cc94d7743cf790b07f4
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Apr 1 14:27:59 2010 +0300
Release 7.7.1-1ubuntu1.
diff --git a/debian/changelog b/debian/changelog
index 7f9982d..bb85f35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (7.7.1-1ubuntu1) UNRELEASED; urgency=low
+mesa (7.7.1-1ubuntu1) lucid; urgency=low
- [Alberto Milone]
+ [ Alberto Milone ]
* debian/rules: pass --with-dri-searchpath=/usr/lib/dri:/usr/lib32/dri
to confflags-dri on i386 so that /usr/lib32/dri is used for 32 bit
compatibility on 64 bit systems (LP: #248392).
- -- Alberto Milone <alberto.milone@canonical.com> Wed, 10 Mar 2010 13:26:38 +0100
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 01 Apr 2010 13:31:09 +0300
mesa (7.7.1-1) unstable; urgency=low
commit 8d98d7832011d7ba490cbc18247508469ce21ddb
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Mar 30 17:15:15 2010 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index dad803e..e336418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.7.1-1) UNRELEASED; urgency=low
+mesa (7.7.1-1) unstable; urgency=low
[ Brice Goglin ]
* Remove Thierry Reding from Uploaders, closes: #572539.
@@ -7,7 +7,7 @@ mesa (7.7.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Thu, 04 Mar 2010 20:51:29 +0100
+ -- Brice Goglin <bgoglin@debian.org> Tue, 30 Mar 2010 17:15:09 +0200
mesa (7.7-4) unstable; urgency=low
commit ce01e79d7bd1a13928cc7a2cf6cc8816c2c47695
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Mar 30 17:14:41 2010 +0200
Bump Standards-Version to 3.8.4
diff --git a/debian/changelog b/debian/changelog
index f76cb90..dad803e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (7.7.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Remove Thierry Reding from Uploaders, closes: #572539.
+ * Bump Standards-Version to 3.8.4, no changes needed.
[ Timo Aaltonen ]
* New upstream release.
diff --git a/debian/control b/debian/control
index 645f8e5..4d16f72 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Build-Depends: debhelper (>= 6.0.7), quilt (>= 0.40), pkg-config,
libdrm-dev (>= 2.4.15) [!hurd-i386], libx11-dev, xutils-dev,
x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev,
commit 44083f0cd6c471e7a08ec58d26a339011f66f938
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Mar 29 19:52:23 2010 +0300
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index ac9f030..b215bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,177 @@
+commit 0c88e340499c961cc7a06107a727710a67e280ed
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date: Sun Mar 28 16:25:47 2010 -0700
+
+ mesa: Add 7.7.1 release MD5 sums
+
+commit 663642b435af2f8ab4b16360783eb367f42486c3
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date: Sun Mar 28 16:22:44 2010 -0700
+
+ mesa: set version string to 7.7.1
+
+ Also set the correct release date.
+
+commit 535742d75f0096b22d1b8ff203ae561167af18f7
+Author: Brian Paul <brianp@vmware.com>
+Date: Sat Mar 27 08:58:02 2010 -0600
+
+ mesa: move/update hash function comments
+
+commit 8fe3b3f66ae57a1a6eca7f6dcb0455e14ad92075
+Author: Török Edwin <edwintorok@gmail.com>
+Date: Sat Mar 27 08:55:45 2010 -0600
+
+ mesa: fix deadlock in _mesa_HashFindFreeKeyBlock()
+
+ Fixes fd.o bug 27340.
+
+commit 4cf14fa80bda5f4ea65bef3a64e748e064d0bde1
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Fri Mar 26 16:29:59 2010 +0100
+
+ dri/swrast: Fix frontbuffer rendering.
+
+ Was broken since the endianness fixes.
+
+commit 6ec259eb17dfbb74972b8cffb4e02a9dbab288cc
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Fri Mar 26 16:29:59 2010 +0100
+
+ dri/swrast: Fix missed conversion of one pixel pointer increment.
+
+ This probably broke the swrast DRI driver when running X in depth 16.
+
+commit ca1c8a183d7eb1adda165643369e6127478d6afd
+Author: Brian Paul <brianp@vmware.com>
+Date: Tue Mar 23 09:19:44 2010 -0600
+
+ docs: added news item for 7.7.1 release
+
+commit 3f3b1094bf4455504e3b77da5a3cb66c5d099499
+Author: Brian Paul <brianp@vmware.com>
+Date: Tue Mar 23 09:19:26 2010 -0600
+
+ docs: insert expected 7.7.1 release date
+
+commit e33121b2d84ddbbdbed6663490e05d7011c69e9a
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon Mar 22 18:15:53 2010 -0700
+
+ mesa: set version string to 7.7.1-rc2
+
+commit 415d0326bb9eea0d8c2b837ca767dc9b829d917c
+Author: Pauli Nieminen <suokkos@gmail.com>
+Date: Sun Mar 21 23:23:21 2010 +0200
+
+ r200: Fix emit size prediction to account elt splitting.
+
+ Emit sizes prediction didn't account for render splitting in
+ hwtnl path.
+
+commit 7e24ce2d9b0aa3ca19449b9ace56e89c25bc0f76
+Author: Pauli Nieminen <suokkos@gmail.com>
+Date: Sun Mar 21 22:55:13 2010 +0200
+
+ r200: Don't flush when closing elts in KMS.
+
+ Flush in middle of rendering in KMS is not allowed because
+ buffers are discarded in flush.
+
+ Fixes crash when emiting split indices with RADEON_DEBUG=all.
+
+commit 2ae754b7b97c56709a7f12f017bf846a9e1456aa
+Author: Pauli Nieminen <suokkos@gmail.com>
+Date: Sun Mar 21 20:16:17 2010 +0200
+
+ r200: Fix swtnl fallback to flush pending rendering before transition.
+
+ Flush after transition would emit wrong state that could cause
+ wrong state emited for pending rendering operation.
+
+ Fixes wan once from extrement tuxracer that is using per vertex
+ materials.
+
+commit 501156b36bed203a0e77ffb1be81a04c5598d1bc
+Author: Pauli Nieminen <suokkos@gmail.com>
+Date: Sun Mar 21 20:02:10 2010 +0200
+
+ r200: Fix mixed indetion in r200TclFallback.
+
+commit 4ff3244457fb92d269fe488d225fce17f1b5d48c
+Author: Pauli Nieminen <suokkos@gmail.com>
+Date: Sun Mar 21 12:42:10 2010 +0200
+
+ vbo: Fix vbo_split_copy to pass correct max_index to draw.
+
+ vbo_split_copy was passing one past the max_index to draw function
+ which caused _tnl_draw_prims function to read uninitialized values
+ from copied array.
+
+ Bug was spoted in valgrind report of progs/tests/cva_huge.
+
+commit 3889556d70283417fc912aa63dc99c1a59e4e2a4
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Fri Mar 19 17:32:05 2010 +0100
+
+ Revert "Revert "mesa/st: Make ST_SURFACE_DEPTH index consistent with mesa's BUFFER_DEPTH.""
+
+ This reverts commit 52d83efdbc4735d721e6fc9b44f29bdd432d4d73.
+
+ The fix it reverted should be fine with the two previous fixes.
+
+commit 6412046f6509d348fe417cb58f7f9ce9bedfff63
+Author: Brian Paul <brianp@vmware.com>
+Date: Thu Mar 11 14:51:02 2010 -0700
+
+ st/mesa: s/BUFFER_FRONT_LEFT/surfIndex/
+ (cherry picked from commit 5d5c524cbe534a868fff8f6d6f64bcb89066e32c)
+
+commit 6e96cea6e2de2ccc580d425a299cd9bab505ee8c
+Author: Brian Paul <brianp@vmware.com>
+Date: Thu Mar 11 13:44:39 2010 -0700
+
+ st/mesa: fix st_set_framebuffer_surface() state validation
+
+ Set the _NEW_BUFFERS flag and remove the code which updated the
+ parent framebuffer size. Normal Mesa state validation will do that.
+
+ Fixes issues with Warsow on r300g and possibly other bugs.
+ (cherry picked from commit c472ce5302a590b45d8affe00c1fcce04f8b8585)
+
+commit 3a3ef3d6c9a9f0fbea0674bd2c275be2be2f6519
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date: Thu Mar 18 17:30:15 2010 -0700
+
+ intel: Use bit-wise not instead of logical not (i830 path)
+
+ The assertion is checking that the low-order bits of offset are not
+ set. It does this by anding the inverted offset mask with the
+ offset. This is clearly intended to be a bit-wise "invert".
+
+ Fixes bug #25984.
+ (cherry picked from commit 062a208814ad65d330f403c46d4bed88648f334f)
+
+commit 98aed6dc697d009bb08bd63b41bd3a6b66fb7333
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date: Thu Mar 18 17:28:52 2010 -0700
+
+ intel: Correct value of S0_VB_OFFSET_MASK to match hardware docs.
+ (cherry picked from commit 689e4b554123bbf9af727b910dad9d1b32521f95)
+
+commit d3a607f8893bfb0d31fe679c530db9743f14d15f
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date: Thu Mar 18 15:35:05 2010 -0700
+
+ Use bit-wise not instead of logical not.
+
+ The assertion is checking that the low-order bits of offset are not
+ set. It does this by anding the inverted offset mask with the
+ offset. This is clearly intended to be a bit-wise "invert".
+
+ Fixes bug #25984.
+ (cherry picked from commit fda5078324e0a940a2ddfdd1c63ffceb47c5a717)
+
commit 00e41e007e82195fe935d827402a3af6200672b8
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Sat Mar 13 20:25:29 2010 +0100
diff --git a/debian/changelog b/debian/changelog
index bb75c3e..f76cb90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
-mesa (7.7.1~rc1-1) UNRELEASED; urgency=low
+mesa (7.7.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Remove Thierry Reding from Uploaders, closes: #572539.
[ Timo Aaltonen ]
- * New upstream release candidate.
- * Pull from upstream mesa_7_7_branch up to commit 00e41e00.
+ * New upstream release.
-- Brice Goglin <bgoglin@debian.org> Thu, 04 Mar 2010 20:51:29 +0100
commit 0c88e340499c961cc7a06107a727710a67e280ed
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Mar 28 16:25:47 2010 -0700
mesa: Add 7.7.1 release MD5 sums
diff --git a/docs/relnotes-7.7.1.html b/docs/relnotes-7.7.1.html
index 699627d..00b3671 100644
--- a/docs/relnotes-7.7.1.html
+++ b/docs/relnotes-7.7.1.html
@@ -26,7 +26,15 @@ for DRI hardware acceleration.
<h2>MD5 checksums</h2>
<pre>
-tbd
+3ab0638cfa7ce8157337a229cf0db2c4 MesaLib-7.7.1.tar.gz
+46664d99e03f1e3ac078a7fea02af115 MesaLib-7.7.1.tar.bz2
+4e73ba8abb59aff79485eb95d7cefff7 MesaLib-7.7.1.zip
+bf1b108983995f7a712cf3343df1c918 MesaDemos-7.7.1.tar.gz
+aeb39645d80d656e0adebaa09e5bcd03 MesaDemos-7.7.1.tar.bz2
+01c49b7454fd292244eaf8bdc6ed8cf0 MesaDemos-7.7.1.zip
+37ec6386693dcb6dc770d1efd63a7a93 MesaGLUT-7.7.1.tar.gz
+1e16c85282f843791a21f7bc7b6a1ca8 MesaGLUT-7.7.1.tar.bz2
+d352c9e36a8e4d1059f4abc017b131e0 MesaGLUT-7.7.1.zip
</pre>
commit 663642b435af2f8ab4b16360783eb367f42486c3
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Mar 28 16:22:44 2010 -0700
mesa: set version string to 7.7.1
Also set the correct release date.
diff --git a/Makefile b/Makefile
index f148e9e..f43e74a 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.7.1-rc2
+VERSION=7.7.1
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/docs/relnotes-7.7.1.html b/docs/relnotes-7.7.1.html
index 46f4cac..699627d 100644
--- a/docs/relnotes-7.7.1.html
+++ b/docs/relnotes-7.7.1.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.7.1 Release Notes / March 26, 2010</H1>
+<H1>Mesa 7.7.1 Release Notes / March 28, 2010</H1>
<p>
Mesa 7.7.1 is a bug-fix release.
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index bc61b52..92a0b02 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -32,7 +32,7 @@
#define MESA_MAJOR 7
#define MESA_MINOR 7
#define MESA_PATCH 1
-#define MESA_VERSION_STRING "7.7.1-rc2"
+#define MESA_VERSION_STRING "7.7.1"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 535742d75f0096b22d1b8ff203ae561167af18f7
Author: Brian Paul <brianp@vmware.com>
Date: Sat Mar 27 08:58:02 2010 -0600
mesa: move/update hash function comments
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index f28db7a..dbbe70e 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -120,12 +120,8 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
/**
- * Lookup an entry in the hash table.
- *
- * \param table the hash table.
- * \param key the key.
- *
- * \return pointer to user's data or NULL if key not in table
+ * Lookup an entry in the hash table, without locking.
+ * \sa _mesa_HashLookup
*/
static INLINE void *
_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
@@ -147,6 +143,15 @@ _mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
return NULL;
}
+
+/**
+ * Lookup an entry in the hash table.
+ *
+ * \param table the hash table.
+ * \param key the key.
+ *
+ * \return pointer to user's data or NULL if key not in table
+ */
void *
_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
{
commit 8fe3b3f66ae57a1a6eca7f6dcb0455e14ad92075
Author: Török Edwin <edwintorok@gmail.com>
Date: Sat Mar 27 08:55:45 2010 -0600
mesa: fix deadlock in _mesa_HashFindFreeKeyBlock()
Fixes fd.o bug 27340.
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index fdfbe6b..f28db7a 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -127,8 +127,8 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
*
* \return pointer to user's data or NULL if key not in table
*/
-void *
-_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
+static INLINE void *
+_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
{
GLuint pos;
const struct HashEntry *entry;
@@ -137,19 +137,26 @@ _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
assert(key);
pos = HASH_FUNC(key);
- _glthread_LOCK_MUTEX(table->Mutex);
entry = table->Table[pos];
while (entry) {
if (entry->Key == key) {
- _glthread_UNLOCK_MUTEX(table->Mutex);
return entry->Data;
}
entry = entry->Next;
}
- _glthread_UNLOCK_MUTEX(table->Mutex);
return NULL;
}
+void *
+_mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
+{
+ void *res;
+ assert(table);
+ _glthread_LOCK_MUTEX(table->Mutex);
+ res = _mesa_HashLookup_unlocked(table, key);
+ _glthread_UNLOCK_MUTEX(table->Mutex);
+ return res;
+}
/**
@@ -447,7 +454,7 @@ _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
GLuint freeStart = 1;
GLuint key;
for (key = 1; key != maxKey; key++) {
- if (_mesa_HashLookup(table, key)) {
+ if (_mesa_HashLookup_unlocked(table, key)) {
/* darn, this key is already in use */
freeCount = 0;
freeStart = key+1;
commit 4cf14fa80bda5f4ea65bef3a64e748e064d0bde1
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Mar 26 16:29:59 2010 +0100
dri/swrast: Fix frontbuffer rendering.
Was broken since the endianness fixes.
diff --git a/src/mesa/drivers/dri/swrast/swrast_spantemp.h b/src/mesa/drivers/dri/swrast/swrast_spantemp.h
index e0cb241..1790dd9 100644
--- a/src/mesa/drivers/dri/swrast/swrast_spantemp.h
+++ b/src/mesa/drivers/dri/swrast/swrast_spantemp.h
@@ -37,7 +37,7 @@
#define _SWRAST_SPANTEMP_ONCE
static INLINE void
-PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
+PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLvoid *p )
{
__DRIcontext *ctx = swrast_context(glCtx);
__DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer);
@@ -179,7 +179,8 @@ NAME(put_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
if (mask) {
for (i = 0; i < count; i++) {
if (mask[i]) {
- RB_TYPE pixel[4];
+ RB_TYPE row[4];
+ INIT_PIXEL_PTR(pixel, x, y);
STORE_PIXEL(pixel, x + i, y, src[i]);
PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
}
@@ -212,7 +213,8 @@ NAME(put_row_rgb)( GLcontext *ctx, struct gl_renderbuffer *rb,
if (mask) {
for (i = 0; i < count; i++) {
if (mask[i]) {
- RB_TYPE pixel[4];
+ RB_TYPE row[4];
+ INIT_PIXEL_PTR(pixel, x, y);
#ifdef STORE_PIXEL_RGB
STORE_PIXEL_RGB(pixel, x + i, y, src[i]);
#else
@@ -253,7 +255,8 @@ NAME(put_mono_row)( GLcontext *ctx, struct gl_renderbuffer *rb,
if (mask) {
for (i = 0; i < count; i++) {
if (mask[i]) {
- RB_TYPE pixel[4];
+ RB_TYPE row[4];
+ INIT_PIXEL_PTR(pixel, x, y);
STORE_PIXEL(pixel, x + i, y, src);
PUT_PIXEL(ctx, x + i, YFLIP(xrb, y), pixel);
}
@@ -285,7 +288,8 @@ NAME(put_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
ASSERT(mask);
for (i = 0; i < count; i++) {
if (mask[i]) {
- RB_TYPE pixel[4];
+ RB_TYPE row[4];
+ INIT_PIXEL_PTR(pixel, x, y);
STORE_PIXEL(pixel, x[i], y[i], src[i]);
PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
}
@@ -307,7 +311,8 @@ NAME(put_mono_values)( GLcontext *ctx, struct gl_renderbuffer *rb,
ASSERT(mask);
for (i = 0; i < count; i++) {
if (mask[i]) {
- RB_TYPE pixel[4];
+ RB_TYPE row[4];
+ INIT_PIXEL_PTR(pixel, x, y);
STORE_PIXEL(pixel, x[i], y[i], src);
PUT_PIXEL(ctx, x[i], YFLIP(xrb, y[i]), pixel);
}
commit 6ec259eb17dfbb74972b8cffb4e02a9dbab288cc
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Mar 26 16:29:59 2010 +0100
dri/swrast: Fix missed conversion of one pixel pointer increment.
This probably broke the swrast DRI driver when running X in depth 16.
diff --git a/src/mesa/drivers/dri/swrast/swrast_span.c b/src/mesa/drivers/dri/swrast/swrast_span.c
index f8e5034..a4bcfb6 100644
--- a/src/mesa/drivers/dri/swrast/swrast_span.c
+++ b/src/mesa/drivers/dri/swrast/swrast_span.c
@@ -257,7 +257,7 @@ static const GLubyte kernel[16] = {
struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
#define INIT_PIXEL_PTR(P, X, Y) \
GLushort *P = (GLushort *)row;
-#define INC_PIXEL_PTR(P) P += 2
+#define INC_PIXEL_PTR(P) P++
#define STORE_PIXEL(DST, X, Y, VALUE) \
STORE_PIXEL_R5G6B5(DST, X, Y, VALUE)
#define FETCH_PIXEL(DST, SRC) \
commit ca1c8a183d7eb1adda165643369e6127478d6afd
Author: Brian Paul <brianp@vmware.com>
Date: Tue Mar 23 09:19:44 2010 -0600
docs: added news item for 7.7.1 release
diff --git a/docs/news.html b/docs/news.html
index 0a0be71..b6fa0b9 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,6 +10,15 @@
<H1>News</H1>
+
+<h2>March 26, 2010</h2>
+<p>
+<a href="relnotes-7.7.1.html">Mesa 7.7.1</a> is released. This is a bug-fix
+release fixing issues found in the 7.7 release.
+</p>
+
+
+
<h2>December 21, 2009</h2>
<p>
<a href="relnotes-7.6.1.html">Mesa 7.6.1</a> is released. This is a bug-fix
commit 3f3b1094bf4455504e3b77da5a3cb66c5d099499
Author: Brian Paul <brianp@vmware.com>
Date: Tue Mar 23 09:19:26 2010 -0600
docs: insert expected 7.7.1 release date
diff --git a/docs/relnotes-7.7.1.html b/docs/relnotes-7.7.1.html
index 93cf88f..46f4cac 100644
--- a/docs/relnotes-7.7.1.html
+++ b/docs/relnotes-7.7.1.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.7.1 Release Notes / date tbd</H1>
+<H1>Mesa 7.7.1 Release Notes / March 26, 2010</H1>
<p>
Mesa 7.7.1 is a bug-fix release.
commit e33121b2d84ddbbdbed6663490e05d7011c69e9a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Mar 22 18:15:53 2010 -0700
mesa: set version string to 7.7.1-rc2
diff --git a/Makefile b/Makefile
index bd44a23..f148e9e 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.7.1-rc1
+VERSION=7.7.1-rc2
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 3441592..bc61b52 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -32,7 +32,7 @@
#define MESA_MAJOR 7
#define MESA_MINOR 7
#define MESA_PATCH 1
-#define MESA_VERSION_STRING "7.7.1-rc1"
+#define MESA_VERSION_STRING "7.7.1-rc2"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 415d0326bb9eea0d8c2b837ca767dc9b829d917c
Author: Pauli Nieminen <suokkos@gmail.com>
Date: Sun Mar 21 23:23:21 2010 +0200
r200: Fix emit size prediction to account elt splitting.
Emit sizes prediction didn't account for render splitting in
hwtnl path.
diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
index 39748a2..6170128 100644
--- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c
+++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
@@ -194,7 +194,7 @@ void r200FlushElts(GLcontext *ctx)
radeonReturnDmaRegion(&rmesa->radeon, R200_ELT_BUF_SZ - elt_used);
if (radeon_is_debug_enabled(RADEON_SYNC, RADEON_CRITICAL)
- && !rmesa->radeon.radeonScreen->kernel_mm) {
+ && !rmesa->radeon.radeonScreen->kernel_mm) {
radeon_print(RADEON_SYNC, RADEON_NORMAL, "%s: Syncing\n", __FUNCTION__);
radeonFinish( rmesa->radeon.glCtx );
}
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c
index 46dce98..be72627 100644
--- a/src/mesa/drivers/dri/r200/r200_tcl.c
+++ b/src/mesa/drivers/dri/r200/r200_tcl.c
@@ -405,8 +405,9 @@ static GLuint r200EnsureEmitSize( GLcontext * ctx , GLubyte* vimap_rev )
rendering code may decide convert to elts.
In that case we have to make pessimistic prediction.
and use larger of 2 paths. */
- const GLuint elts = ELTS_BUFSZ(nr_aos);
- const GLuint index = INDEX_BUFSZ;
+ const GLuint elt_count =(VB->Primitive[i].count/GET_MAX_HW_ELTS() + 1);
+ const GLuint elts = ELTS_BUFSZ(nr_aos) * elt_count;
+ const GLuint index = INDEX_BUFSZ * elt_count;
const GLuint vbuf = VBUF_BUFSZ;
if ( (!VB->Elts && VB->Primitive[i].count >= MAX_CONVERSION_SIZE)
|| vbuf > index + elts)
commit 7e24ce2d9b0aa3ca19449b9ace56e89c25bc0f76
Author: Pauli Nieminen <suokkos@gmail.com>
Date: Sun Mar 21 22:55:13 2010 +0200
r200: Don't flush when closing elts in KMS.
Flush in middle of rendering in KMS is not allowed because
buffers are discarded in flush.
Fixes crash when emiting split indices with RADEON_DEBUG=all.
diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
index d545363..39748a2 100644
--- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c
+++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
@@ -193,7 +193,8 @@ void r200FlushElts(GLcontext *ctx)
if (R200_ELT_BUF_SZ > elt_used)
radeonReturnDmaRegion(&rmesa->radeon, R200_ELT_BUF_SZ - elt_used);
- if (radeon_is_debug_enabled(RADEON_SYNC, RADEON_CRITICAL)) {
+ if (radeon_is_debug_enabled(RADEON_SYNC, RADEON_CRITICAL)
+ && !rmesa->radeon.radeonScreen->kernel_mm) {
radeon_print(RADEON_SYNC, RADEON_NORMAL, "%s: Syncing\n", __FUNCTION__);
radeonFinish( rmesa->radeon.glCtx );
}
commit 2ae754b7b97c56709a7f12f017bf846a9e1456aa
Author: Pauli Nieminen <suokkos@gmail.com>
Date: Sun Mar 21 20:16:17 2010 +0200
r200: Fix swtnl fallback to flush pending rendering before transition.
Flush after transition would emit wrong state that could cause
wrong state emited for pending rendering operation.
Fixes wan once from extrement tuxracer that is using per vertex
materials.
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c
index 1594344..46dce98 100644
--- a/src/mesa/drivers/dri/r200/r200_tcl.c
+++ b/src/mesa/drivers/dri/r200/r200_tcl.c
@@ -692,20 +692,30 @@ void r200TclFallback( GLcontext *ctx, GLuint bit, GLboolean mode )
GLuint oldfallback = rmesa->radeon.TclFallback;
if (mode) {
- rmesa->radeon.TclFallback |= bit;
if (oldfallback == 0) {
+ /* We have to flush before transition */
+ if ( rmesa->radeon.dma.flush )
+ rmesa->radeon.dma.flush( rmesa->radeon.glCtx );
+
if (R200_DEBUG & RADEON_FALLBACKS)
fprintf(stderr, "R200 begin tcl fallback %s\n",
getFallbackString( bit ));
+ rmesa->radeon.TclFallback |= bit;
transition_to_swtnl( ctx );
- }
+ } else
+ rmesa->radeon.TclFallback |= bit;
} else {
- rmesa->radeon.TclFallback &= ~bit;
if (oldfallback == bit) {
+ /* We have to flush before transition */
+ if ( rmesa->radeon.dma.flush )
+ rmesa->radeon.dma.flush( rmesa->radeon.glCtx );
+
if (R200_DEBUG & RADEON_FALLBACKS)
fprintf(stderr, "R200 end tcl fallback %s\n",
getFallbackString( bit ));
+ rmesa->radeon.TclFallback &= ~bit;
transition_to_hwtnl( ctx );
- }
+ } else
+ rmesa->radeon.TclFallback &= ~bit;
}
}
commit 501156b36bed203a0e77ffb1be81a04c5598d1bc
Author: Pauli Nieminen <suokkos@gmail.com>
Date: Sun Mar 21 20:02:10 2010 +0200
r200: Fix mixed indetion in r200TclFallback.
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c
index e7d48a7..1594344 100644
--- a/src/mesa/drivers/dri/r200/r200_tcl.c
+++ b/src/mesa/drivers/dri/r200/r200_tcl.c
@@ -688,25 +688,24 @@ static char *getFallbackString(GLuint bit)
void r200TclFallback( GLcontext *ctx, GLuint bit, GLboolean mode )
{
- r200ContextPtr rmesa = R200_CONTEXT(ctx);
- GLuint oldfallback = rmesa->radeon.TclFallback;
-
- if (mode) {
- rmesa->radeon.TclFallback |= bit;
- if (oldfallback == 0) {
- if (R200_DEBUG & RADEON_FALLBACKS)
- fprintf(stderr, "R200 begin tcl fallback %s\n",
- getFallbackString( bit ));
- transition_to_swtnl( ctx );
- }
- }
- else {
- rmesa->radeon.TclFallback &= ~bit;
- if (oldfallback == bit) {
- if (R200_DEBUG & RADEON_FALLBACKS)
- fprintf(stderr, "R200 end tcl fallback %s\n",
- getFallbackString( bit ));
- transition_to_hwtnl( ctx );
- }
- }
+ r200ContextPtr rmesa = R200_CONTEXT(ctx);
+ GLuint oldfallback = rmesa->radeon.TclFallback;
+
+ if (mode) {
+ rmesa->radeon.TclFallback |= bit;
+ if (oldfallback == 0) {
+ if (R200_DEBUG & RADEON_FALLBACKS)
+ fprintf(stderr, "R200 begin tcl fallback %s\n",
+ getFallbackString( bit ));
+ transition_to_swtnl( ctx );
+ }
+ } else {
+ rmesa->radeon.TclFallback &= ~bit;
+ if (oldfallback == bit) {
+ if (R200_DEBUG & RADEON_FALLBACKS)
+ fprintf(stderr, "R200 end tcl fallback %s\n",
+ getFallbackString( bit ));
+ transition_to_hwtnl( ctx );
+ }
+ }
}
commit 4ff3244457fb92d269fe488d225fce17f1b5d48c
Author: Pauli Nieminen <suokkos@gmail.com>
Date: Sun Mar 21 12:42:10 2010 +0200
vbo: Fix vbo_split_copy to pass correct max_index to draw.
vbo_split_copy was passing one past the max_index to draw function
which caused _tnl_draw_prims function to read uninitialized values
from copied array.
Bug was spoted in valgrind report of progs/tests/cva_huge.
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 2ca1112..67291ea 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -196,7 +196,7 @@ flush( struct copy_context *copy )
©->dstib,
GL_TRUE,
0,
- copy->dstbuf_nr );
+ copy->dstbuf_nr - 1 );
/* Reset all pointers:
*/
commit 3889556d70283417fc912aa63dc99c1a59e4e2a4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Mar 19 17:32:05 2010 +0100
Revert "Revert "mesa/st: Make ST_SURFACE_DEPTH index consistent with mesa's BUFFER_DEPTH.""
This reverts commit 52d83efdbc4735d721e6fc9b44f29bdd432d4d73.
The fix it reverted should be fine with the two previous fixes.
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index 83d33c2..bcc4c28 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -173,8 +173,7 @@ st_set_framebuffer_surface(struct st_framebuffer *stfb,
assert(ST_SURFACE_BACK_LEFT == BUFFER_BACK_LEFT);
assert(ST_SURFACE_FRONT_RIGHT == BUFFER_FRONT_RIGHT);
assert(ST_SURFACE_BACK_RIGHT == BUFFER_BACK_RIGHT);
- /* XXX The current values are wrong but fixing this causes new bugs*/
- /* assert(ST_SURFACE_DEPTH == BUFFER_DEPTH); */
+ assert(ST_SURFACE_DEPTH == BUFFER_DEPTH);
assert(surfIndex < BUFFER_COUNT);
diff --git a/src/mesa/state_tracker/st_public.h b/src/mesa/state_tracker/st_public.h
index f9ba252..1936ed6 100644
--- a/src/mesa/state_tracker/st_public.h
+++ b/src/mesa/state_tracker/st_public.h
@@ -39,8 +39,7 @@
#define ST_SURFACE_BACK_LEFT 1
#define ST_SURFACE_FRONT_RIGHT 2
#define ST_SURFACE_BACK_RIGHT 3
-/* XXX This value is wrong but fixing this causes other bugs */
-#define ST_SURFACE_DEPTH 8
+#define ST_SURFACE_DEPTH 4
#define ST_TEXTURE_2D 0x2
#define ST_TEXTURE_RECT 0x4
commit 6412046f6509d348fe417cb58f7f9ce9bedfff63
Author: Brian Paul <brianp@vmware.com>
Date: Thu Mar 11 14:51:02 2010 -0700
st/mesa: s/BUFFER_FRONT_LEFT/surfIndex/
(cherry picked from commit 5d5c524cbe534a868fff8f6d6f64bcb89066e32c)
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index 2aedf6a..83d33c2 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -190,7 +190,7 @@ st_set_framebuffer_surface(struct st_framebuffer *stfb,
_mesa_warning(ctx, "Out of memory allocating renderbuffer");
return;
}
- _mesa_add_renderbuffer(&stfb->Base, BUFFER_FRONT_LEFT, rb);
+ _mesa_add_renderbuffer(&stfb->Base, surfIndex, rb);
strb = st_renderbuffer(rb);
}
commit 6e96cea6e2de2ccc580d425a299cd9bab505ee8c
Author: Brian Paul <brianp@vmware.com>
Date: Thu Mar 11 13:44:39 2010 -0700
st/mesa: fix st_set_framebuffer_surface() state validation
Set the _NEW_BUFFERS flag and remove the code which updated the
parent framebuffer size. Normal Mesa state validation will do that.
Fixes issues with Warsow on r300g and possibly other bugs.
(cherry picked from commit c472ce5302a590b45d8affe00c1fcce04f8b8585)
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c
index 26ee224..2aedf6a 100644
--- a/src/mesa/state_tracker/st_framebuffer.c
+++ b/src/mesa/state_tracker/st_framebuffer.c
@@ -166,9 +166,7 @@ st_set_framebuffer_surface(struct st_framebuffer *stfb,
uint surfIndex, struct pipe_surface *surf)
{
GET_CURRENT_CONTEXT(ctx);
- static const GLuint invalid_size = 9999999;
struct st_renderbuffer *strb;
- GLuint width, height, i;
/* sanity checks */
assert(ST_SURFACE_FRONT_LEFT == BUFFER_FRONT_LEFT);
@@ -183,18 +181,17 @@ st_set_framebuffer_surface(struct st_framebuffer *stfb,
strb = st_renderbuffer(stfb->Base.Attachment[surfIndex].Renderbuffer);
if (!strb) {
- if (surfIndex == ST_SURFACE_FRONT_LEFT) {
- /* Delayed creation when the window system supplies a fake front buffer */
- struct st_renderbuffer *strb_back
- = st_renderbuffer(stfb->Base.Attachment[ST_SURFACE_BACK_LEFT].Renderbuffer);
- struct gl_renderbuffer *rb
- = st_new_renderbuffer_fb(surf->format, strb_back->Base.NumSamples, FALSE);
- _mesa_add_renderbuffer(&stfb->Base, BUFFER_FRONT_LEFT, rb);
- strb = st_renderbuffer(rb);
Reply to: