diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-29 09:46:49 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-29 09:46:49 -0600 |
| commit | 124f5875eae0b914d5c679fec6b25633907ad843 (patch) | |
| tree | fcacb16e4b09a320130eb23d1d20662f1f380a62 | |
| parent | 170bd0c8827f6f65c7bfa5a7fb68ba0678ed57ba (diff) | |
| parent | 69a3043f4109463f35e87102e509e0a4599cd09a (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/mesa/main/version.h
| -rw-r--r-- | docs/news.html | 11 | ||||
| -rw-r--r-- | docs/relnotes-7.6.1.html | 44 | ||||
| -rw-r--r-- | docs/relnotes.html | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tile_cache.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/texstate.c | 22 |
5 files changed, 75 insertions, 8 deletions
diff --git a/docs/news.html b/docs/news.html index 07ad42ed49..93da56a5c3 100644 --- a/docs/news.html +++ b/docs/news.html @@ -10,6 +10,17 @@ <H1>News</H1> +<h2>September 28, 2009</h2> +<p> +<a href="relnotes-7.6.html">Mesa 7.6</a> 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. +</p> +<p> +<a href="relnotes-7.5.2.html">Mesa 7.5.2</a> is also released. +This is a stable release fixing bugs since the 7.5.1 release. +</p> + <h2>September 3, 2009</h2> <p> diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html new file mode 100644 index 0000000000..584a2de926 --- /dev/null +++ b/docs/relnotes-7.6.1.html @@ -0,0 +1,44 @@ +<HTML> + +<TITLE>Mesa Release Notes</TITLE> + +<head><link rel="stylesheet" type="text/css" href="mesa.css"></head> + +<BODY> + +<body bgcolor="#eeeeee"> + +<H1>Mesa 7.6.1 Release Notes, (date tbd)</H1> + +<p> +Mesa 7.6.1 is a bug-fix release fixing issues since version 7.6. +</p> +<p> +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. +</p> +<p> +See the <a href="install.html">Compiling/Installing page</a> for prerequisites +for DRI hardware acceleration. +</p> + + +<h2>MD5 checksums</h2> +<pre> +tbd +</pre> + + +<h2>New features</h2> +<ul> +</ul> + + +<h2>Bug fixes</h2> +<ul> +<li>Fixed crash caused by glXCopyContext() and glXDestroyContext(), bug 24217 +</ul> + +</body> +</html> diff --git a/docs/relnotes.html b/docs/relnotes.html index 7a87f58a82..b301ee046a 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. <UL> <LI><A HREF="relnotes-7.7.html">7.7 release notes</A> +<LI><A HREF="relnotes-7.6.1.html">7.6.1 release notes</A> <LI><A HREF="relnotes-7.6.html">7.6 release notes</A> <LI><A HREF="relnotes-7.5.2.html">7.5.2 release notes</A> <LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A> diff --git a/src/gallium/drivers/softpipe/sp_tile_cache.c b/src/gallium/drivers/softpipe/sp_tile_cache.c index de47970985..83fb4e0d15 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 b9311d0ffc..43f26873e0 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); } } |