Merge remote-tracking branch 'origin/released'

* origin/released:
  xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Conflicts:
	mesalib/src/glsl/glcpp/glcpp.c
	openssl/Makefile

8 files changed, 343 insertions, 48 deletions

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 799db4bc0..09c8caa28 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -55,7 +55,7 @@ GL 3.1 --- all DONE: i965, nv50, nvc0, r600, radeonsi
   Forward compatible context support/deprecations       DONE ()
   Instanced drawing (GL_ARB_draw_instanced)             DONE (swrast)
   Buffer copying (GL_ARB_copy_buffer)                   DONE (r300, swrast)
-  Primitive restart (GL_NV_primitive_restart)           DONE (r300, )
+  Primitive restart (GL_NV_primitive_restart)           DONE (r300)
   16 vertex texture image units                         DONE ()
   Texture buffer objs (GL_ARB_texture_buffer_object)    DONE for OpenGL 3.1 contexts ()
   Rectangular textures (GL_ARB_texture_rectangle)       DONE (r300, swrast)
@@ -63,42 +63,42 @@ GL 3.1 --- all DONE: i965, nv50, nvc0, r600, radeonsi
   Signed normalized textures (GL_EXT_texture_snorm)     DONE (r300)
 
 
-GL 3.2 --- all DONE: i965
+GL 3.2 --- all DONE: i965, nv50, nvc0, r600, radeonsi
 
   Core/compatibility profiles                           DONE
   GLSL 1.50                                             DONE ()
   Geometry shaders                                      DONE ()
-  BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE (nv50, nvc0, r300, r600, radeonsi, swrast)
-  Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE (nv50, nvc0, r300, r600, radeonsi, swrast)
-  Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (nv50, nvc0, r300, r600, radeonsi, swrast)
-  Provoking vertex (GL_ARB_provoking_vertex)            DONE (nv50, nvc0, r300, r600, radeonsi, swrast)
-  Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE (nvc0, r600, radeonsi)
-  Multisample textures (GL_ARB_texture_multisample)     DONE (nvc0, r600, radeonsi)
-  Frag depth clamp (GL_ARB_depth_clamp)                 DONE (nv50, nvc0, r600, swrast, radeonsi)
-  Fence objects (GL_ARB_sync)                           DONE (nv50, nvc0, r300, r600, radeonsi, swrast)
+  BGRA vertex order (GL_ARB_vertex_array_bgra)          DONE (r300, swrast)
+  Base vertex offset(GL_ARB_draw_elements_base_vertex)  DONE (r300, swrast)
+  Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (r300, swrast)
+  Provoking vertex (GL_ARB_provoking_vertex)            DONE (r300, swrast)
+  Seamless cubemaps (GL_ARB_seamless_cube_map)          DONE ()
+  Multisample textures (GL_ARB_texture_multisample)     DONE ()
+  Frag depth clamp (GL_ARB_depth_clamp)                 DONE (swrast)
+  Fence objects (GL_ARB_sync)                           DONE (r300, swrast)
   GLX_ARB_create_context_profile                        DONE
 
 
-GL 3.3 --- all DONE: i965
+GL 3.3 --- all DONE: i965, nv50, nvc0, r600, radeonsi
 
   GLSL 3.30                                             DONE ()
-  GL_ARB_blend_func_extended                            DONE (nv50, nvc0, r600, radeonsi, softpipe)
-  GL_ARB_explicit_attrib_location                       DONE (i915, nv50, nvc0, r300, r600, radeonsi, swrast)
-  GL_ARB_occlusion_query2                               DONE (nv50, nvc0, r300, r600, radeonsi, swrast)
-  GL_ARB_sampler_objects                                DONE (nv50, nvc0, r300, r600, radeonsi)
-  GL_ARB_shader_bit_encoding                            DONE (nv50, nvc0, r600, radeonsi)
-  GL_ARB_texture_rgb10_a2ui                             DONE (r600, radeonsi)
-  GL_ARB_texture_swizzle                                DONE (nv50, nvc0, r300, r600, radeonsi, swrast)
-  GL_ARB_timer_query                                    DONE (nv50, nvc0, r600, radeonsi)
-  GL_ARB_instanced_arrays                               DONE (nv50, nvc0, r300, r600, radeonsi)
-  GL_ARB_vertex_type_2_10_10_10_rev                     DONE (r600, radeonsi)
+  GL_ARB_blend_func_extended                            DONE (softpipe)
+  GL_ARB_explicit_attrib_location                       DONE (all drivers that support GLSL)
+  GL_ARB_occlusion_query2                               DONE (r300, swrast)
+  GL_ARB_sampler_objects                                DONE (all drivers)
+  GL_ARB_shader_bit_encoding                            DONE ()
+  GL_ARB_texture_rgb10_a2ui                             DONE ()
+  GL_ARB_texture_swizzle                                DONE (r300, swrast)
+  GL_ARB_timer_query                                    DONE ()
+  GL_ARB_instanced_arrays                               DONE (r300)
+  GL_ARB_vertex_type_2_10_10_10_rev                     DONE ()
 
 
 GL 4.0:
 
   GLSL 4.0                                             not started
   GL_ARB_texture_query_lod                             DONE (i965)
-  GL_ARB_draw_buffers_blend                            DONE (i965, r600, radeonsi, softpipe)
+  GL_ARB_draw_buffers_blend                            DONE (i965, nv50, nvc0, r600, radeonsi, softpipe)
   GL_ARB_draw_indirect                                 DONE (i965)
   GL_ARB_gpu_shader5                                   started
   GL_ARB_gpu_shader_fp64                               not started
@@ -106,18 +106,18 @@ GL 4.0:
   GL_ARB_shader_subroutine                             not started
   GL_ARB_tessellation_shader                           not started
   GL_ARB_texture_buffer_object_rgb32                   DONE (i965, r600, radeonsi, softpipe)
-  GL_ARB_texture_cube_map_array                        DONE (i965, r600, softpipe)
+  GL_ARB_texture_cube_map_array                        DONE (i965, nvc0, r600, softpipe)
   GL_ARB_texture_gather                                DONE (i965)
-  GL_ARB_transform_feedback2                           DONE (i965, r600, radeonsi)
-  GL_ARB_transform_feedback3                           DONE (i965, r600, radeonsi)
+  GL_ARB_transform_feedback2                           DONE (i965, nv50, nvc0, r600, radeonsi)
+  GL_ARB_transform_feedback3                           DONE (i965, nv50, nvc0, r600, radeonsi)
 
 
 GL 4.1:
 
   GLSL 4.1                                             not started
-  GL_ARB_ES2_compatibility                             DONE (i965, r300, r600, radeonsi)
+  GL_ARB_ES2_compatibility                             DONE (i965, nv50, nvc0, r300, r600, radeonsi)
   GL_ARB_get_program_binary                            DONE (0 binary formats)
-  GL_ARB_separate_shader_objects                       some infrastructure done
+  GL_ARB_separate_shader_objects                       started (Ian Romanick, Gregory Hainaut)
   GL_ARB_shader_precision                              not started
   GL_ARB_vertex_attrib_64bit                           not started
   GL_ARB_viewport_array                                DONE (i965)
@@ -130,13 +130,13 @@ GL 4.2:
   GL_ARB_compressed_texture_pixel_storage              not started
   GL_ARB_shader_atomic_counters                        DONE (i965)
   GL_ARB_texture_storage                               DONE (all drivers)
-  GL_ARB_transform_feedback_instanced                  DONE (i965, r600, radeonsi)
+  GL_ARB_transform_feedback_instanced                  DONE (i965, nv50, nvc0, r600, radeonsi)
   GL_ARB_base_instance                                 DONE (i965, nv50, nvc0, r600, radeonsi)
   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)
-  GL_ARB_map_buffer_alignment                          DONE (r300, r600, radeonsi)
+  GL_ARB_internalformat_query                          DONE (i965, nv50, nvc0, r300, r600, radeonsi)
+  GL_ARB_map_buffer_alignment                          DONE (all drivers)
 
 
 GL 4.3:
@@ -144,8 +144,8 @@ GL 4.3:
   GLSL 4.3                                             not started
   GL_ARB_arrays_of_arrays                              started
   GL_ARB_ES3_compatibility                             DONE (i965)
-  GL_ARB_clear_buffer_object                           not started
-  GL_ARB_compute_shader                                not started
+  GL_ARB_clear_buffer_object                           DONE (all drivers)
+  GL_ARB_compute_shader                                started (Paul Berry)
   GL_ARB_copy_image                                    not started
   GL_KHR_debug                                         DONE (all drivers)
   GL_ARB_explicit_uniform_location                     not started
@@ -162,7 +162,7 @@ GL 4.3:
   GL_ARB_texture_buffer_range                          DONE (nv50, nvc0, i965, r600, radeonsi)
   GL_ARB_texture_query_levels                          DONE (i965)
   GL_ARB_texture_storage_multisample                   DONE (all drivers that support GL_ARB_texture_multisample)
-  GL_ARB_texture_view                                  not started
+  GL_ARB_texture_view                                  started (Courtney Goeltzenleuchter, Chris Forbes)
   GL_ARB_vertex_attrib_binding                         DONE (all drivers)
 
 
@@ -173,7 +173,7 @@ GL 4.4:
   GL_ARB_buffer_storage                                not started
   GL_ARB_clear_texture                                 not started
   GL_ARB_enhanced_layouts                              not started
-  GL_ARB_multi_bind                                    not started
+  GL_ARB_multi_bind                                    started (Fredrik Höglund)
   GL_ARB_query_buffer_object                           not started
   GL_ARB_texture_mirror_clamp_to_edge                  DONE (i965, nv30, nv50, nvc0, r300, r600, radeonsi, swrast)
   GL_ARB_texture_stencil8                              not started
diff --git a/mesalib/docs/README.UVD b/mesalib/docs/README.UVD
index 36b467edf..38ea8646a 100644
--- a/mesalib/docs/README.UVD
+++ b/mesalib/docs/README.UVD
@@ -11,3 +11,34 @@ INFORMATION FOR PACKAGED MEDIA IS EXPRESSLY PROHIBITED WITHOUT A LICENSE
 UNDER APPLICABLE PATENTS IN THE MPEG-2 PATENT PORTFOLIO, WHICH LICENSES IS
 AVAILABLE FROM MPEG LA, LLC, 6312 S. Fiddlers Green Circle, Suite 400E,
 Greenwood Village, Colorado 80111 U.S.A.
+
+WARRANTY DISCLAIMER: THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
+KIND.  AMD DISCLAIMS ALL WARRANTIES, EXPRESS, IMPLIED, OR STATUTORY, INCLUDING
+BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, THAT THE SOFTWARE WILL RUN
+UNINTERRUPTED OR ERROR-FREE OR WARRANTIES ARISING FROM CUSTOM OF TRADE OR
+COURSE OF USAGE.  THE ENTIRE RISK ASSOCIATED WITH THE USE OF THE SOFTWARE IS
+ASSUMED BY YOU.  Some jurisdictions do not allow the exclusion of implied
+warranties, so the above exclusion may not apply to You.
+
+LIMITATION OF LIABILITY AND INDEMNIFICATION:  AMD AND ITS LICENSORS WILL NOT,
+UNDER ANY CIRCUMSTANCES BE LIABLE FOR ANY PUNITIVE, DIRECT, INCIDENTAL,
+INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM USE OF THE SOFTWARE OR
+THIS AGREEMENT EVEN IF AMD AND ITS LICENSORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.  In no event shall AMD's total liability to You
+for all damages, losses, and causes of action (whether in contract, tort
+(including negligence) or otherwise) exceed the amount of $100 USD.  You agree
+to defend, indemnify and hold harmless AMD and its licensors, and any of their
+directors, officers, employees, affiliates or agents from and against any and
+all loss, damage, liability and other expenses (including reasonable
+attorneys' fees), resulting from Your use of the Software or violation of the
+terms and conditions of this Agreement.
+
+U.S. GOVERNMENT RESTRICTED RIGHTS: The Software is provided with "RESTRICTED
+RIGHTS." Use, duplication, or disclosure by the Government is subject to the
+restrictions as set forth in FAR 52.227-14 and DFAR252.227-7013, et seq., or
+its successor.  Use of the Software by the Government constitutes
+acknowledgement of AMD's proprietary rights in them.
+
+EXPORT RESTRICTIONS: The Software may be subject to export restrictions as
+stated in the Software License Agreement.
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html
index dc2324194..eebb8c73b 100644
--- a/mesalib/docs/egl.html
+++ b/mesalib/docs/egl.html
@@ -232,16 +232,6 @@ The supported platforms are X11, DRM, FBDEV, and GDI.</p>
 
 </dd>
 
-<dt><code>egl_glx</code></dt>
-<dd>
-
-<p>This driver provides a wrapper to GLX.  It uses exclusively GLX to implement
-the EGL API.  It supports both direct and indirect rendering when the GLX does.
-It is accelerated when the GLX is.  As such, it cannot provide functions that
-is not available in GLX or GLX extensions.</p>
-</dd>
-</dl>
-
 <h2>Packaging</h2>
 
 <p>The ABI between the main library and its drivers are not stable.  Nor is
@@ -262,10 +252,6 @@ is disabled by default.</p>
 <code>src/egl/</code>.  The sources of the <code>egl</code> state tracker can
 be found at <code>src/gallium/state_trackers/egl/</code>.</p>
 
-<p>The suggested way to learn to write a EGL driver is to see how other drivers
-are written.  <code>egl_glx</code> should be a good reference.  It works in any
-environment that has GLX support, and it is simpler than most drivers.</p>
-
 <h3>Lifetime of Display Resources</h3>
 
 <p>Contexts and surfaces are examples of display resources.  They might live
diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html
index 1d3772899..4f92801b5 100644
--- a/mesalib/docs/index.html
+++ b/mesalib/docs/index.html
@@ -16,6 +16,12 @@
 
 <h1>News</h1>
 
+<h2>February 3, 2014</h2>
+<p>
+<a href="relnotes/10.0.3.html">Mesa 10.0.3</a> is released.
+This is a bug-fix release.
+</p>
+
 <h2>January 9, 2014</h2>
 <p>
 <a href="relnotes/10.0.2.html">Mesa 10.0.2</a> is released.
diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html
index c3c277dea..430274c52 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.3.html">10.0.3 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>
diff --git a/mesalib/docs/relnotes/10.0.3.html b/mesalib/docs/relnotes/10.0.3.html
new file mode 100644
index 000000000..ad7b50864
--- /dev/null
+++ b/mesalib/docs/relnotes/10.0.3.html
@@ -0,0 +1,206 @@
+<!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.3 Release Notes / (February 3, 2014)</h1>
+
+<p>
+Mesa 10.0.3 is a bug fix release which fixes bugs found since the 10.0.2 release.
+</p>
+<p>
+Mesa 10.0.3 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>
+5f9f463ef08129f6762106b434910adb  MesaLib-10.0.3.tar.bz2
+fb3997b6500e153bc32370cb3fc4ca9e  MesaLib-10.0.3.tar.gz
+a07b4b6b9eb449b88a6cb5061e51c331  MesaLib-10.0.3.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=72708">Bug 72708</a> - Master fails to build with older gcc due to -msse4.1</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=72926">Bug 72926</a> - [REGRESSION,swrast] Memory-related crash with anti-aliasing enabled</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73096">Bug 73096</a> - Query GL_RGBA_SIGNED_COMPONENTS_EXT missing</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73100">Bug 73100</a> - Please use AC_PATH_TOOL instead of AC_PATH_PROG for llvm-config</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73418">Bug 73418</a> - OpenCL hangs graphics on CAYMAN</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73473">Bug 73473</a> - Potential crash bug in src/gallium/auxiliary/rtasm/rtasm_execmem.c</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73915">Bug 73915</a> - sample shading + centroid broken since f5cfb4a</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=73956">Bug 73956</a> - SIGSEGV when passing GL_NONE to glReadBuffer</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=74026">Bug 74026</a> - Compiler rejects chained assignments involving array dereferences</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.2..mesa-10.0.3
+</pre>
+
+<p>Aaron Watry (2):</p>
+<ul>
+  <li>radeon: Move gfx/dma cs cleanup to r600_common_context_cleanup</li>
+  <li>st/dri: prevent leak of dri option default values</li>
+</ul>
+
+<p>Andreas Fänger (1):</p>
+<ul>
+  <li>swrast: fix delayed texel buffer allocation regression for OpenMP</li>
+</ul>
+
+<p>Anuj Phogat (3):</p>
+<ul>
+  <li>glsl: Disable ARB_texture_rectangle in shader version 100.</li>
+  <li>i965: Use sample barycentric coordinates with per sample shading</li>
+  <li>i965: Ignore 'centroid' interpolation qualifier in case of persample shading</li>
+</ul>
+
+<p>Brian Paul (3):</p>
+<ul>
+  <li>mesa: implement missing glGet(GL_RGBA_SIGNED_COMPONENTS_EXT) query</li>
+  <li>st/mesa: fix glReadBuffer(GL_NONE) segfault</li>
+  <li>draw: fix incorrect vertex size computation in LLVM drawing code</li>
+</ul>
+
+<p>Carl Worth (5):</p>
+<ul>
+  <li>Add md5sums for 10.0.2. release.</li>
+  <li>cherry-ignore: Ignore several patches not yet ready for the stable branch</li>
+  <li>Drop another couple of patches.</li>
+  <li>cherry-ignore: Ignore 4 patches at teh request of the author, (Anuj).</li>
+  <li>Update version to 10.0.3</li>
+</ul>
+
+<p>Chad Versace (1):</p>
+<ul>
+  <li>i965/gen6/blorp: Emit more flushes to workaround hangs</li>
+</ul>
+
+<p>Chris Forbes (1):</p>
+<ul>
+  <li>i965: fold offset into coord for textureOffset(gsampler2DRect)</li>
+</ul>
+
+<p>Emil Velikov (5):</p>
+<ul>
+  <li>mesa: use signed temporary variable to store _ColorDrawBufferIndexes</li>
+  <li>st/mesa: use signed temporary variable to store _ColorDrawBufferIndexes</li>
+  <li>nv50: access only the available amount of textures</li>
+  <li>nv50: access only the available amount of constbuf</li>
+  <li>gallium/rtasm: handle mmap failures appropriately</li>
+</ul>
+
+<p>Eric Anholt (2):</p>
+<ul>
+  <li>i965: Fix handling of MESA_pack_invert in blit (PBO) readpixels.</li>
+  <li>i965: Don't do the temporary-and-blit-copy for INVALIDATE_RANGE maps.</li>
+</ul>
+
+<p>Ian Romanick (2):</p>
+<ul>
+  <li>mesa: Add COMPRESSED_RGBA_S3TC_DXT1_EXT to COMPRESSED_TEXTURE_FORMATS for GLES</li>
+  <li>radeon / r200: Pass the API into _mesa_initialize_context</li>
+</ul>
+
+<p>Ilia Mirkin (2):</p>
+<ul>
+  <li>mesa: fix GL_COLOR_SUM enum for drivers without ARB_vertex_program</li>
+  <li>st/vdpau: don't return a device if the screen doesn't support NPOT</li>
+</ul>
+
+<p>José Fonseca (1):</p>
+<ul>
+  <li>mesa: Use IROUND instead of roundf.</li>
+</ul>
+
+<p>Kenneth Graunke (2):</p>
+<ul>
+  <li>glsl: Rename "expr" to "lhs_expr" in vector_extract munging code.</li>
+  <li>glsl: Fix chained assignments of vector channels.</li>
+</ul>
+
+<p>Lauri Kasanen (1):</p>
+<ul>
+  <li>mesa: Fix build to properly check for supported compiler flags</li>
+</ul>
+
+<p>Marek Olšák (2):</p>
+<ul>
+  <li>st/mesa: use sRGB formats for MSAA resolving if destination is sRGB</li>
+  <li>gallium/util: util_format_srgb should not return FORMAT_NONE for sRGB formats</li>
+</ul>
+
+<p>Matt Turner (2):</p>
+<ul>
+  <li>glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.</li>
+  <li>glx: Update glxext.h to revision 24777.</li>
+</ul>
+
+<p>Michał Górny (1):</p>
+<ul>
+  <li>Use AC_PATH_TOOL instead of AC_PATH_PROG for llvm-config.</li>
+</ul>
+
+<p>Paul Berry (1):</p>
+<ul>
+  <li>i965: Ensure that all necessary state is re-emitted if we run out of aperture.</li>
+</ul>
+
+<p>Paul Seidler (1):</p>
+<ul>
+  <li>build: move ARCH_LIBS definition outside of ASM definition</li>
+</ul>
+
+<p>Thomas Sondergaard (4):</p>
+<ul>
+  <li>mesa: Preliminary support for MSVC_VERSION=12.0</li>
+  <li>mesa: Fix compile error with MSVC 2013</li>
+  <li>mesa: Work around internal compiler error</li>
+  <li>mesa: Namespace qualify fma to override ambiguity with fma from math.h</li>
+</ul>
+
+<p>Tom Stellard (1):</p>
+<ul>
+  <li>r600g/compute: Emit DEALLOC_STATE on cayman after dispatching a compute shader.</li>
+</ul>
+
+</div>
+</body>
+</html>
diff --git a/mesalib/docs/relnotes/10.1.html b/mesalib/docs/relnotes/10.1.html
index 14b635f24..c9566adfc 100644
--- a/mesalib/docs/relnotes/10.1.html
+++ b/mesalib/docs/relnotes/10.1.html
@@ -47,8 +47,12 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_draw_indirect on i965.</li>
 <li>GL_ARB_clear_buffer_object</li>
 <li>GL_ARB_viewport_array on i965.</li>
+<li>GL_ARB_map_buffer_alignment on all drivers that did not previously support
+it.</li>
 <li>GL_AMD_shader_trinary_minmax.</li>
+<li>GL_EXT_framebuffer_blit on r200 and radeon.</li>
 <li>Reduced memory usage for display lists.</li>
+<li>OpenGL 3.3 support on nv50, nvc0, r600 and radeonsi</li>
 </ul>
 
 
diff --git a/mesalib/docs/relnotes/10.2.html b/mesalib/docs/relnotes/10.2.html
new file mode 100644
index 000000000..332c33a3f
--- /dev/null
+++ b/mesalib/docs/relnotes/10.2.html
@@ -0,0 +1,61 @@
+<!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.2 Release Notes / TBD</h1>
+
+<p>
+Mesa 10.2 is a new development release.
+People who are concerned with stability and reliability should stick
+with a previous release or wait for Mesa 10.2.1.
+</p>
+<p>
+Mesa 10.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 are not supported.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+TBD.
+</pre>
+
+
+<h2>New features</h2>
+
+<p>
+Note: some of the new features are only available with certain drivers.
+</p>
+
+<ul>
+</ul>
+
+
+<h2>Bug fixes</h2>
+
+TBD.
+
+<h2>Changes</h2>
+
+<ul>
+</ul>
+
+</div>
+</body>
+</html>