diff --git a/docs/news.html b/docs/news.html
index 07ad42ed49b..93da56a5c33 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -10,6 +10,17 @@
News
+September 28, 2009
+
+Mesa 7.6 is released. This is a new feature
+release. Those especially concerned about stability may want to wait for the
+follow-on 7.6.1 bug-fix release.
+
+
+Mesa 7.5.2 is also released.
+This is a stable release fixing bugs since the 7.5.1 release.
+
+
September 3, 2009
diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html
new file mode 100644
index 00000000000..584a2de926a
--- /dev/null
+++ b/docs/relnotes-7.6.1.html
@@ -0,0 +1,44 @@
+
+
+
Mesa Release Notes
+
+Mesa 7.6.1 Release Notes, (date tbd)
+
+
+Mesa 7.6.1 is a bug-fix release fixing issues since version 7.6.
+
+
+Mesa 7.6.1 implements the OpenGL 2.1 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 2.1.
+
+
+See the Compiling/Installing page for prerequisites
+for DRI hardware acceleration.
+
+
+
+MD5 checksums
+
+tbd
+
+
+
+New features
+
+
+
+Bug fixes
+
+Fixed crash caused by glXCopyContext() and glXDestroyContext(), bug 24217
+
+
+
+
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 7a87f58a82f..b301ee046a7 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -14,6 +14,7 @@ The release notes summarize what's new or changed in each Mesa release.
7.7 release notes
+7.6.1 release notes
7.6 release notes
7.5.2 release notes
7.5.1 release notes
diff --git a/src/gallium/drivers/softpipe/sp_tile_cache.c b/src/gallium/drivers/softpipe/sp_tile_cache.c
index de479709858..83fb4e0d151 100644
--- a/src/gallium/drivers/softpipe/sp_tile_cache.c
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.c
@@ -96,6 +96,11 @@ sp_create_tile_cache( struct pipe_screen *screen )
tc->entries[pos].addr.bits.invalid = 1;
}
tc->last_tile = &tc->entries[0]; /* any tile */
+
+#if TILE_CLEAR_OPTIMIZATION
+ /* set flags to indicate all the tiles are cleared */
+ memset(tc->clear_flags, 255, sizeof(tc->clear_flags));
+#endif
}
return tc;
}
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index b9311d0ffc9..43f26873e0f 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -97,16 +97,22 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
dst->Texture.Unit[u].BumpTarget = src->Texture.Unit[u].BumpTarget;
COPY_4V(dst->Texture.Unit[u].RotMatrix, src->Texture.Unit[u].RotMatrix);
+ /*
+ * XXX strictly speaking, we should compare texture names/ids and
+ * bind textures in the dest context according to id. For now, only
+ * copy bindings if the contexts share the same pool of textures to
+ * avoid refcounting bugs.
+ */
+ if (dst->Shared == src->Shared) {
+ /* copy texture object bindings, not contents of texture objects */
+ _mesa_lock_context_textures(dst);
- /* copy texture object bindings, not contents of texture objects */
- _mesa_lock_context_textures(dst);
-
- for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
- _mesa_reference_texobj(&dst->Texture.Unit[u].CurrentTex[tex],
- src->Texture.Unit[u].CurrentTex[tex]);
+ for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
+ _mesa_reference_texobj(&dst->Texture.Unit[u].CurrentTex[tex],
+ src->Texture.Unit[u].CurrentTex[tex]);
+ }
+ _mesa_unlock_context_textures(dst);
}
-
- _mesa_unlock_context_textures(dst);
}
}