19 files changed, 208 insertions, 31 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index f98a54a78..0672ec708 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -132,7 +132,7 @@ GL 4.2:
   GL_ARB_texture_storage                               DONE (all drivers)
   GL_ARB_transform_feedback_instanced                  DONE (i965, r600, radeonsi)
   GL_ARB_base_instance                                 DONE (i965, nv50, nvc0, r600, radeonsi)
-  GL_ARB_shader_image_load_store                       not started
+  GL_ARB_shader_image_load_store                       in progress (curro)
   GL_ARB_conservative_depth                            DONE (all drivers that support GLSL 1.30)
   GL_ARB_shading_language_420pack                      DONE (all drivers that support GLSL 1.30)
   GL_ARB_internalformat_query                          DONE (i965, r300, r600, radeonsi)
diff --git a/mesalib/docs/conform.html b/mesalib/docs/conform.html
index c5f8ece83..55931376b 100644
--- a/mesalib/docs/conform.html
+++ b/mesalib/docs/conform.html
@@ -19,7 +19,7 @@
 <p>
 The SGI OpenGL conformance tests verify correct operation of OpenGL
 implementations.  I, Brian Paul, have been given a copy of the tests
-for testing Mesa.  The tests are not publically available.
+for testing Mesa.  The tests are not publicly available.
 </p>
 <p>
 This file has the latest results of testing Mesa with the OpenGL 1.2
diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html
index a9d8b4f7d..d4a6dfb59 100644
--- a/mesalib/docs/devinfo.html
+++ b/mesalib/docs/devinfo.html
@@ -206,7 +206,7 @@ exclusively for the older branch.
 This "CC" syntax for patch nomination will cause patches to automatically be
 copied to the mesa-stable@ mailing list when you use "git send-email" to send
 patches to the mesa-dev@ mailing list. Also, if you realize that a commit
-should be nominate for the stable branch after it has already been commited,
+should be nominated for the stable branch after it has already been committed,
 you can send a note directly to the mesa-stable@lists.freedesktop.org where
 the Mesa stable-branch maintainers will receive it. Be sure to mention the
 commit ID of the commit of interest (as it appears in the mesa master branch).
diff --git a/mesalib/docs/dispatch.html b/mesalib/docs/dispatch.html
index 4b529bc04..aacd01e0c 100644
--- a/mesalib/docs/dispatch.html
+++ b/mesalib/docs/dispatch.html
@@ -25,7 +25,7 @@ href="#overview">overview of Mesa's implementation</a>.</p>
 <h2>1. Complexity of GL Dispatch</h2>
 
 <p>Every GL application has at least one object called a GL <em>context</em>.
-This object, which is an implicit parameter to ever GL function, stores all
+This object, which is an implicit parameter to every GL function, stores all
 of the GL related state for the application.  Every texture, every buffer
 object, every enable, and much, much more is stored in the context.  Since
 an application can have more than one context, the context to be used is
@@ -51,7 +51,7 @@ example, <tt>glFogCoordf</tt> may operate differently depending on whether
 or not fog is enabled.</p>
 
 <p>In multi-threaded environments, it is possible for each thread to have a
-differnt GL context current.  This means that poor old <tt>glVertex3fv</tt>
+different GL context current.  This means that poor old <tt>glVertex3fv</tt>
 has to know which GL context is current in the thread where it is being
 called.</p>
 
@@ -207,13 +207,13 @@ few preprocessor defines.</p>
 <li>If <tt>GLX_USE_TLS</tt> is defined, method #4 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>
+<li>If none of the preceding are defined, method #1 is used.</li>
 </ul>
 
 <p>Two different techniques are used to handle the various different cases.
 On x86 and SPARC, a macro called <tt>GL_STUB</tt> is used.  In the preamble
 of the assembly source file different implementations of the macro are
-selected based on the defined preprocessor variables.  The assmebly code
+selected based on the defined preprocessor variables.  The assembly code
 then consists of a series of invocations of the macros such as:
 
 <blockquote>
@@ -242,7 +242,7 @@ first technique, is to insert <tt>#ifdef</tt> within the assembly
 implementation of each function.  This makes the assembly file considerably
 larger (e.g., 29,332 lines for <tt>glapi_x86-64.S</tt> versus 1,155 lines for
 <tt>glapi_x86.S</tt>) and causes simple changes to the function
-implementation to generate many lines of diffs.  Since the assmebly files
+implementation to generate many lines of diffs.  Since the assembly files
 are typically generated by scripts (see <a href="#autogen">below</a>), this
 isn't a significant problem.</p>
 
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html
index 240cec53a..dc2324194 100644
--- a/mesalib/docs/egl.html
+++ b/mesalib/docs/egl.html
@@ -88,7 +88,7 @@ drivers will be installed to <code>${libdir}/egl</code>.</p>
 <dd>
 
 <p>List the platforms (window systems) to support.  Its argument is a comma
-seprated string such as <code>--with-egl-platforms=x11,drm</code>.  It decides
+separated string such as <code>--with-egl-platforms=x11,drm</code>.  It decides
 the platforms a driver may support.  The first listed platform is also used by
 the main library to decide the native platform: the platform the EGL native
 types such as <code>EGLNativeDisplayType</code> or
@@ -223,7 +223,7 @@ the X server directly using (XCB-)DRI2 protocol.</p>
 <dd>
 
 <p>This driver is based on Gallium3D.  It supports all rendering APIs and
-hardwares supported by Gallium3D.  It is the only driver that supports OpenVG.
+hardware supported by Gallium3D.  It is the only driver that supports OpenVG.
 The supported platforms are X11, DRM, FBDEV, and GDI.</p>
 
 <p>This driver comes with its own hardware drivers
@@ -273,8 +273,8 @@ longer than the display that creates them.</p>
 
 <p>In EGL, when a display is terminated through <code>eglTerminate</code>, all
 display resources should be destroyed.  Similarly, when a thread is released
-throught <code>eglReleaseThread</code>, all current display resources should be
-released.  Another way to destory or release resources is through functions
+through <code>eglReleaseThread</code>, all current display resources should be
+released.  Another way to destroy or release resources is through functions
 such as <code>eglDestroySurface</code> or <code>eglMakeCurrent</code>.</p>
 
 <p>When a resource that is current to some thread is destroyed, the resource
diff --git a/mesalib/docs/envvars.html b/mesalib/docs/envvars.html
index 3cc3c8096..31d14a45a 100644
--- a/mesalib/docs/envvars.html
+++ b/mesalib/docs/envvars.html
@@ -47,7 +47,7 @@ sometimes be useful for debugging end-user issues.
 <li>MESA_NO_SSE - if set, disables Intel SSE optimizations
 <li>MESA_DEBUG - if set, error messages are printed to stderr.  For example,
    if the application generates a GL_INVALID_ENUM error, a corresponding error
-   message indicating where the error occured, and possibly why, will be
+   message indicating where the error occurred, and possibly why, will be
    printed to stderr.<br>
    If the value of MESA_DEBUG is 'FP' floating point arithmetic errors will
    generate exceptions.
@@ -201,14 +201,14 @@ See src/mesa/state_tracker/st_debug.c for other options.
     to stderr
 <li>SOFTPIPE_NO_RAST - if set, rasterization is no-op'd.  For profiling purposes.
 <li>SOFTPIPE_USE_LLVM - if set, the softpipe driver will try to use LLVM JIT for
-    vertex shading procesing.
+    vertex shading processing.
 </ul>
 
 
 <h3>LLVMpipe driver environment variables</h3>
 <ul>
 <li>LP_NO_RAST - if set LLVMpipe will no-op rasterization
-<li>LP_DEBUG - a comma-separated list of debug options is acceptec.  See the
+<li>LP_DEBUG - a comma-separated list of debug options is accepted.  See the
     source code for details.
 <li>LP_PERF - a comma-separated list of options to selectively no-op various
     parts of the driver.  See the source code for details.
diff --git a/mesalib/docs/faq.html b/mesalib/docs/faq.html
index 97c59d381..d4037e83c 100644
--- a/mesalib/docs/faq.html
+++ b/mesalib/docs/faq.html
@@ -137,7 +137,7 @@ Just follow the Mesa <a href="install.html">compilation instructions</a>.
 <h2>1.6 Are there other open-source implementations of OpenGL?</h2>
 <p>
 Yes, SGI's <a href="http://oss.sgi.com/projects/ogl-sample/index.html">
-OpenGL Sample Implemenation (SI)</a> is available.
+OpenGL Sample Implementation (SI)</a> is available.
 The SI was written during the time that OpenGL was originally designed.
 Unfortunately, development of the SI has stagnated.
 Mesa is much more up to date with modern features and extensions.
@@ -353,7 +353,7 @@ That's where Mesa development is discussed.
 </p>
 <p>
 The <a href="http://www.opengl.org/documentation">
-OpenGL Specification</a> is the bible for OpenGL implemention work.
+OpenGL Specification</a> is the bible for OpenGL implementation work.
 You should read it.
 </p>
 <p>Most of the Mesa development work involves implementing new OpenGL
@@ -375,7 +375,7 @@ For a Gallium3D hardware driver, the r300g, r600g and the i915g are good example
 </p>
 <p>The DRI website has more information about writing hardware drivers.
 The process isn't well document because the Mesa driver interface changes
-over time, and we seldome have spare time for writing documentation.
+over time, and we seldom have spare time for writing documentation.
 That being said, many people have managed to figure out the process.
 </p>
 <p>
@@ -390,7 +390,7 @@ The <a href="http://oss.sgi.com/projects/ogl-sample/registry/EXT/texture_compres
 indicates that there are intellectual property (IP) and/or patent issues
 to be dealt with.
 </p>
-<p>We've been unsucessful in getting a response from S3 (or whoever owns
+<p>We've been unsuccessful in getting a response from S3 (or whoever owns
 the IP nowadays) to indicate whether or not an open source project can
 implement the extension (specifically the compression/decompression
 algorithms).
diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html
index e26e9e5b7..1d3772899 100644
--- a/mesalib/docs/index.html
+++ b/mesalib/docs/index.html
@@ -16,11 +16,17 @@
 
 <h1>News</h1>
 
+<h2>January 9, 2014</h2>
+<p>
+<a href="relnotes/10.0.2.html">Mesa 10.0.2</a> is released.
+This is a bug-fix release.
+</p>
+
 <h2>December 12, 2013</h2>
 <p>
 <a href="relnotes/10.0.1.html">Mesa 10.0.1</a>
 and <a href="relnotes/9.2.5.html">Mesa 9.2.5</a> are released.
-These are both bug-fix releases
+These are both bug-fix releases.
 </p>
 
 <h2>November 30, 2013</h2>
diff --git a/mesalib/docs/opengles.html b/mesalib/docs/opengles.html
index f08acb57b..24ad69fe2 100644
--- a/mesalib/docs/opengles.html
+++ b/mesalib/docs/opengles.html
@@ -16,7 +16,7 @@
 
 <h1>OpenGL ES</h1>
 
-<p>Mesa implements OpenGL ES 1.1 and OpenGL ES 2.0.  More informations about
+<p>Mesa implements OpenGL ES 1.1 and OpenGL ES 2.0.  More information about
 OpenGL ES can be found at <a href="http://www.khronos.org/opengles/">
 http://www.khronos.org/opengles/</a>.</p>
 
@@ -48,7 +48,7 @@ EGL drivers for your hardware.</p>
 
 <h3>Dispatch Table</h3>
 
-<p>OpenGL ES has an additional indirection when dispatching fucntions</p>
+<p>OpenGL ES has an additional indirection when dispatching functions</p>
 
 <pre>
   Mesa:       glFoo() --&gt; _mesa_Foo()
diff --git a/mesalib/docs/openvg.html b/mesalib/docs/openvg.html
index 5bc866a33..28ebb82e8 100644
--- a/mesalib/docs/openvg.html
+++ b/mesalib/docs/openvg.html
@@ -20,7 +20,7 @@
 The current version of the OpenVG state tracker implements OpenVG 1.1.
 </p>
 <p>
-More informations about OpenVG can be found at
+More information about OpenVG can be found at
 <a href="http://www.khronos.org/openvg/">
 http://www.khronos.org/openvg/</a> .
 </p>
diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html
index 70e5862fa..c3c277dea 100644
--- a/mesalib/docs/relnotes.html
+++ b/mesalib/docs/relnotes.html
@@ -22,6 +22,7 @@ The release notes summarize what's new or changed in each Mesa release.
 
 <ul>
 <li><a href="relnotes/10.1.html">10.1 release notes</a>
+<li><a href="relnotes/10.0.2.html">10.0.2 release notes</a>
 <li><a href="relnotes/10.0.1.html">10.0.1 release notes</a>
 <li><a href="relnotes/10.0.html">10.0 release notes</a>
 <li><a href="relnotes/9.2.5.html">9.2.5 release notes</a>
diff --git a/mesalib/docs/relnotes/10.0.2.html b/mesalib/docs/relnotes/10.0.2.html
new file mode 100644
index 000000000..f3824dfea
--- /dev/null
+++ b/mesalib/docs/relnotes/10.0.2.html
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Mesa Release Notes</title>
+  <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+  <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 10.0.2 Release Notes / (January 9, 2014)</h1>
+
+<p>
+Mesa 10.0.2 is a bug fix release which fixes bugs found since the 10.0.1 release.
+</p>
+<p>
+Mesa 10.0.2 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is <strong>only</strong> available if requested at context creation
+because compatibility contexts not supported.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+de7d14baf0101b697c140d2f47ef27e9  MesaLib-10.0.2.tar.gz
+8544c0ab3e438a08b5103421ea15b6d2  MesaLib-10.0.2.tar.bz2
+181b0d6c1afca38e98a930d0e564ed90  MesaLib-10.0.2.zip
+</pre>
+
+
+<h2>New features</h2>
+<p>None</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=70740">Bug 70740</a> - HiZ on SNB causes GPU hang with WebGL web app</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72026">Bug 72026</a> - SIGSEGV in fs_visitor::visit(ir_dereference_variable*)</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72264">Bug 72264</a> - GLSL error reporting</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72369">Bug 72369</a> - glitches in serious sam 3 with the sb shader backend</li>
+
+</ul>
+
+<h2>Changes</h2>
+
+<p>The full set of changes can be viewed by using the following git command:</p>
+
+<pre>
+  git log mesa-10.0.1..mesa-10.0.2
+</pre>
+
+<p>Aaron Watry (8):</p>
+<ul>
+  <li>clover: Remove unused variable</li>
+  <li>pipe_loader/sw: close dev-&gt;lib when initialization fails</li>
+  <li>radeon/compute: Stop leaking LLVMContexts in radeon_llvm_parse_bitcode</li>
+  <li>r600/compute: Free compiled kernels when deleting compute state</li>
+  <li>r600/compute: Use the correct FREE macro when deleting compute state</li>
+  <li>radeon/llvm: Free target data at end of optimization</li>
+  <li>st/vdpau: Destroy context when initialization fails</li>
+  <li>r600/pipe: Stop leaking context-&gt;start_compute_cs_cmd.buf on EG/CM</li>
+</ul>
+
+<p>Alex Deucher (1):</p>
+<ul>
+  <li>r600g: fix SUMO2 pci id</li>
+</ul>
+
+<p>Alexander von Gluck IV (1):</p>
+<ul>
+  <li>Haiku: Add in public GL kit headers</li>
+</ul>
+
+<p>Anuj Phogat (1):</p>
+<ul>
+  <li>mesa: Fix error code generation in glBeginConditionalRender()</li>
+</ul>
+
+<p>Carl Worth (2):</p>
+<ul>
+  <li>docs: Add md5sums for the 10.0.1 release.</li>
+  <li>Update version to 10.0.2</li>
+</ul>
+
+<p>Chad Versace (1):</p>
+<ul>
+  <li>i965/gen6: Fix HiZ hang in WebGL Google Maps</li>
+</ul>
+
+<p>Erik Faye-Lund (1):</p>
+<ul>
+  <li>glcpp: error on multiple #else/#elif directives</li>
+</ul>
+
+<p>Henri Verbeet (1):</p>
+<ul>
+  <li>i915: Add support for gl_FragData[0] reads.</li>
+</ul>
+
+<p>Ilia Mirkin (1):</p>
+<ul>
+  <li>nv50: fix a small leak on context destroy</li>
+</ul>
+
+<p>Jonathan Liu (2):</p>
+<ul>
+  <li>st/mesa: use pipe_sampler_view_release()</li>
+  <li>llvmpipe: use pipe_sampler_view_release() to avoid segfault</li>
+</ul>
+
+<p>Kenneth Graunke (2):</p>
+<ul>
+  <li>i965: Fix 3DSTATE_PUSH_CONSTANT_ALLOC_PS packet creation.</li>
+  <li>Revert "mesa: Remove GLXContextID typedef from glx.h."</li>
+</ul>
+
+<p>Kevin Rogovin (1):</p>
+<ul>
+  <li>Use line number information from entire function expression</li>
+</ul>
+
+<p>Kristian Høgsberg (1):</p>
+<ul>
+  <li>dri_util: Don't assume __DRIcontext-&gt;driverPrivate is a gl_context</li>
+</ul>
+
+<p>Marek Olšák (2):</p>
+<ul>
+  <li>mesa: fix interpretation of glClearBuffer(drawbuffer)</li>
+  <li>st/mesa: fix glClear with multiple colorbuffers and different formats</li>
+</ul>
+
+<p>Paul Berry (2):</p>
+<ul>
+  <li>glsl: Teach ir_variable_refcount about ir_loop::counter variables.</li>
+  <li>glsl: Fix inconsistent assumptions about ir_loop::counter.</li>
+</ul>
+
+<p>Vadim Girlin (1):</p>
+<ul>
+  <li>r600g/sb: fix stack size computation on evergreen</li>
+</ul>
+
+</div>
+</body>
+</html>
diff --git a/mesalib/docs/relnotes/10.1.html b/mesalib/docs/relnotes/10.1.html
index 778ae6a57..1089c7199 100644
--- a/mesalib/docs/relnotes/10.1.html
+++ b/mesalib/docs/relnotes/10.1.html
@@ -46,6 +46,7 @@ Note: some of the new features are only available with certain drivers.
 <ul>
 <li>GL_ARB_draw_indirect on i965.</li>
 <li>GL_ARB_clear_buffer_object</li>
+<li>GL_AMD_shader_trinary_minmax.</li>
 </ul>
 
 
diff --git a/mesalib/docs/repository.html b/mesalib/docs/repository.html
index 510f4381a..bb0ae008e 100644
--- a/mesalib/docs/repository.html
+++ b/mesalib/docs/repository.html
@@ -156,7 +156,7 @@ each time you do a pull.
 </p>
 <li>Small changes to master
 <p>
-If you are an experienced git user working on substancial modifications,
+If you are an experienced git user working on substantial modifications,
 you are probably
 working on a separate branch and would rebase your branch prior to
 merging with master.
diff --git a/mesalib/docs/shading.html b/mesalib/docs/shading.html
index 4015cdf2e..77a0ee413 100644
--- a/mesalib/docs/shading.html
+++ b/mesalib/docs/shading.html
@@ -234,7 +234,7 @@ This option is only relevant if EmitHighLevelInstructions is set.
 
 <dt>EmitComments</dt>
 <dd>
-If set, instructions will be annoted with comments to help with debugging.
+If set, instructions will be annotated with comments to help with debugging.
 Extra NOP instructions will also be inserted.
 </dd>
 </dl>
diff --git a/mesalib/docs/sourcetree.html b/mesalib/docs/sourcetree.html
index a6868d398..4c93f6341 100644
--- a/mesalib/docs/sourcetree.html
+++ b/mesalib/docs/sourcetree.html
@@ -123,7 +123,7 @@ each directory.
           Currently there's run-time code generation for x86/SSE, PowerPC
           and Cell SPU.
       <li><b>tgsi</b> - TG Shader Infrastructure.  Code for encoding,
-          manipulating and interpretting GPU programs.
+          manipulating and interpreting GPU programs.
       <li><b>translate</b> - module for translating vertex data from one format
           to another.
       <li><b>util</b> - assorted utilities for arithmetic, hashing, surface
diff --git a/mesalib/docs/thanks.html b/mesalib/docs/thanks.html
index 4ec92d3c2..29a41e49c 100644
--- a/mesalib/docs/thanks.html
+++ b/mesalib/docs/thanks.html
@@ -14,7 +14,7 @@
 <iframe src="contents.html"></iframe>
 <div class="content">
 
-<h1>Acknowledgments</h1>
+<h1>Acknowledgements</h1>
 
 
 The following individuals and groups are to be acknowledged for their
diff --git a/mesalib/docs/vmware-guest.html b/mesalib/docs/vmware-guest.html
index 833f06ceb..b5ea4e0be 100644
--- a/mesalib/docs/vmware-guest.html
+++ b/mesalib/docs/vmware-guest.html
@@ -27,9 +27,10 @@ MacOS are all supported.
 </p>
 
 <p>
-End users shouldn't have to go through all these steps once the driver is
-included in newer Linux distributions.
-Fedora 18 and Ubuntu 12.10 include the VMware guest GL driver, for example.
+Most modern Linux distros include the SVGA3D driver so end users shouldn't
+be concerned with this information.
+But if your distro lacks the driver or you want to update to the latest code
+these instructions explain what to do.
 </p>
 
 <p>
@@ -53,6 +54,13 @@ The components involved in this include:
 <li>Mesa/gallium OpenGL driver: "svga"
 </ul>
 
+<p>
+All of these components reside in the guest Linux virtual machine.
+On the host, all you're doing is running VMware
+<a href="http://www.vmware.com/products/workstation/">Workstation</a> or
+<a href="http://www.vmware.com/products/fusion/">Fusion</a>.
+</p>
+
 
 <h2>Prerequisites</h2>
 
diff --git a/mesalib/docs/xlibdriver.html b/mesalib/docs/xlibdriver.html
index ce1ff3b13..d3d8ab4db 100644
--- a/mesalib/docs/xlibdriver.html
+++ b/mesalib/docs/xlibdriver.html
@@ -107,7 +107,7 @@ for your application.
 <p>
 When using Mesa directly or with GLX, it's up to the application
 writer to create a window with an appropriate colormap.  The GLUT
-toolkit tris to minimize colormap <em>flashing</em> by sharing
+toolkit tries to minimize colormap <em>flashing</em> by sharing
 colormaps when possible.  Specifically, if the visual and depth of the
 window matches that of the root window, the root window's colormap
 will be shared by the Mesa window.  Otherwise, a new, private colormap