Merge remote-tracking branch 'origin/released'

* origin/released:
  randrproto mesa pixman git update 4 oct 2012

5 files changed, 55 insertions, 23 deletions

diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html
index b9a892201..57522992c 100644
--- a/mesalib/docs/contents.html
+++ b/mesalib/docs/contents.html
@@ -58,6 +58,7 @@
 
 <b>User Topics</b>
 <ul>
+<li><a href="shading.html" target="_parent">Shading Language</a>
 <li><a href="egl.html" target="_parent">EGL</a>
 <li><a href="opengles.html" target="_parent">OpenGL ES</a>
 <li><a href="openvg.html" target="_parent">OpenVG / Vega</a>
diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html
index 90752b750..8f4aeef5f 100644
--- a/mesalib/docs/devinfo.html
+++ b/mesalib/docs/devinfo.html
@@ -156,6 +156,30 @@ src/mesa/state_tracker/st_glsl_to_tgsi.cpp can serve as examples.
 </p>
 
 
+<h2>Marking a commit as a candidate for a stable branch</h2>
+
+<p>
+If you want a commit to be applied to a stable branch,
+you should add an appropriate note to the commit message.
+</p>
+
+<p>
+Here are some examples of such a note:
+</p>
+<ul>
+  <li>NOTE: This is a candidate for the 9.0 branch.</li>
+  <li>NOTE: This is a candidate for the 8.0 and 9.0 branches.</li>
+  <li>NOTE: This is a candidate for the stable branches.</li>
+</ul>
+
+
+<h2>Cherry-picking candidates for a stable branch</h2>
+
+<p>
+Please use <code>git cherry-pick -x &lt;commit&gt;</code> for cherry-picking a commit
+from master to a stable branch.
+</p>
+
 <h2>Making a New Mesa Release</h2>
 
 <p>
diff --git a/mesalib/docs/dispatch.html b/mesalib/docs/dispatch.html
index 299d68a96..4b529bc04 100644
--- a/mesalib/docs/dispatch.html
+++ b/mesalib/docs/dispatch.html
@@ -205,7 +205,7 @@ few preprocessor defines.</p>
 
 <ul>
 <li>If <tt>GLX_USE_TLS</tt> is defined, method #4 is used.</li>
-<li>If <tt>PTHREADS</tt> is defined, method #3 is used.</li>
+<li>If <tt>HAVE_PTHREAD</tt> is defined, method #3 is used.</li>
 <li>If <tt>WIN32_THREADS</tt> is defined, method #2 is used.</li>
 <li>If none of the preceeding are defined, method #1 is used.</li>
 </ul>
diff --git a/mesalib/docs/helpwanted.html b/mesalib/docs/helpwanted.html
index 12a2bb5fc..859e65c88 100644
--- a/mesalib/docs/helpwanted.html
+++ b/mesalib/docs/helpwanted.html
@@ -51,21 +51,31 @@ the mailing list.
 <p>
 You can find some further To-do lists here:
 </p>
+
+<p>
+<b>Common To-Do lists:</b>
+</p>
+<ul>
+  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/docs/GL3.txt">
+    <b>GL3.txt</b></a> - Status of OpenGL 3.x / 4.x features in Mesa.</li>
+  <li><a href="http://dri.freedesktop.org/wiki/MissingFunctionality">
+    <b>MissingFunctionality</b></a> - Detailed information about missing OpenGL features.</li>
+</ul>
+
+<p>
+<b>Driver specific To-Do lists:</b>
+</p>
 <ul>
-  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/docs/GL3.txt"
-   ><b>GL3.txt</b></a></li>
-  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/docs/llvm-todo.txt"
-   ><b>LLVMpipe - todo</b></a></li>
-  <li><a href="http://dri.freedesktop.org/wiki/MissingFunctionality"
-   ><b>MissingFunctionality</b></a></li>
-  <li><a href="http://dri.freedesktop.org/wiki/RadeonsiToDo"
-   ><b>RadeonsiToDo</b></a></li>
-  <li><a href="http://dri.freedesktop.org/wiki/R600ToDo"
-   ><b>R600ToDo</b></a></li>
-  <li><a href="http://dri.freedesktop.org/wiki/R300ToDo"
-   ><b>R300ToDo</b></a></li>
-  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/drivers/i915/TODO"
-   ><b>i915g TODO</b></a></li>
+  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/docs/llvm-todo.txt">
+    <b>LLVMpipe</b></a> - Software driver using LLVM for runtime code generation.</li>
+  <li><a href="http://dri.freedesktop.org/wiki/RadeonsiToDo">
+    <b>radeonsi</b></a> - Driver for AMD Southern Island.</li>
+  <li><a href="http://dri.freedesktop.org/wiki/R600ToDo">
+    <b>r600g</b></a> - Driver for ATI/AMD R600 - Northern Island.</li>
+  <li><a href="http://dri.freedesktop.org/wiki/R300ToDo">
+    <b>r300g</b></a> - Driver for ATI R300 - R500.</li>
+  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/drivers/i915/TODO">
+    <b>i915g</b></a> - Driver for Intel i915/i945.</li>
 </ul>
 
 <p>
diff --git a/mesalib/docs/shading.html b/mesalib/docs/shading.html
index a12487bb8..19e20b183 100644
--- a/mesalib/docs/shading.html
+++ b/mesalib/docs/shading.html
@@ -27,7 +27,7 @@ Contents
 </p>
 <ul>
 <li><a href="#envvars">Environment variables</a>
-<li><a href="#glsl120">GLSL 1.20 support</a>
+<li><a href="#support">GLSL 1.40 support</a>
 <li><a href="#unsup">Unsupported Features</a>
 <li><a href="#notes">Implementation Notes</a>
 <li><a href="#hints">Programming Hints</a>
@@ -64,10 +64,10 @@ Example:  export MESA_GLSL=dump,nopt
 </p>
 
 
-<h2 id="glsl120">GLSL Version</h2>
+<h2 id="support">GLSL Version</h2>
 
 <p>
-The GLSL compiler currently supports version 1.20 of the shading language.
+The GLSL compiler currently supports version 1.40 of the shading language.
 </p>
 
 <p>
@@ -75,9 +75,8 @@ Several GLSL extensions are also supported:
 </p>
 <ul>
 <li>GL_ARB_draw_buffers
-<li>GL_ARB_texture_rectangle
 <li>GL_ARB_fragment_coord_conventions
-<li>GL_EXT_texture_array
+<li>GL_ARB_shader_bit_encoding
 </ul>
 
 
@@ -94,7 +93,6 @@ in Mesa:
 <li>Linking of multiple shaders does not always work.  Currently, linking
     is implemented through shader concatenation and re-compiling.  This
     doesn't always work because of some #pragma and preprocessor issues.
-<li>gl_ClipVertex
 <li>The gl_Color and gl_SecondaryColor varying vars are interpolated
     without perspective correction
 </ul>
@@ -251,8 +249,7 @@ regressions.
 
 <p>
 The <a href="http://piglit.freedesktop.org/">Piglit</a> project
-has many GLSL tests and the
-<a href="http://glean.sf.net">Glean</a> glsl1 test tests GLSL features.
+has many GLSL tests.
 </p>
 
 <p>