diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
| commit | aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa (patch) | |
| tree | 37bc7921f864ead4f6eb357b31a1eb66d46aaef9 /mesalib/docs | |
| parent | 2e0adb33e03e3142f1412ed570415c5ce616dcef (diff) | |
| parent | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (diff) | |
| download | vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.gz vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.bz2 vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_util.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/docs')
| -rw-r--r-- | mesalib/docs/GL3.txt | 4 | ||||
| -rw-r--r-- | mesalib/docs/devinfo.html | 5 | ||||
| -rw-r--r-- | mesalib/docs/relnotes.html | 2 | ||||
| -rw-r--r-- | mesalib/docs/relnotes/10.2.html | 6 |
4 files changed, 14 insertions, 3 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 0b663dd34..d8a8894c0 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -113,7 +113,7 @@ GL 4.0: - Enhanced per-sample shading DONE - Interpolation functions started GL_ARB_gpu_shader_fp64 not started - GL_ARB_sample_shading DONE (i965) + GL_ARB_sample_shading DONE (i965, nv50, nvc0) GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader not started GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, softpipe) @@ -188,7 +188,7 @@ GL 4.4: 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 - GL_ARB_vertex_type_10f_11f_11f_rev DONE (i965, nv50, nvc0, r600) + GL_ARB_vertex_type_10f_11f_11f_rev DONE (i965, nv50, nvc0, r600, radeonsi) More info about these features and the work involved can be found at diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html index 67c1f34bd..a947b0d39 100644 --- a/mesalib/docs/devinfo.html +++ b/mesalib/docs/devinfo.html @@ -216,6 +216,11 @@ 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). +The latest set of patches that have been nominated, accepted, or rejected for +the upcoming stable release can always be seen on the +<a href=http://cworth.org/~cworth/mesa-stable-queue/">Mesa Stable Queue</a> +page. + <h2>Cherry-picking candidates for a stable branch</h2> <p> diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index 4e2b7d6ff..b63391879 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,7 +21,7 @@ The release notes summarize what's new or changed in each Mesa release. </p> <ul> -<li><a href="relnotes/10.1.1html">10.1.1 release notes</a> +<li><a href="relnotes/10.1.1.html">10.1.1 release notes</a> <li><a href="relnotes/10.1.html">10.1 release notes</a> <li><a href="relnotes/10.0.5.html">10.0.5 release notes</a> <li><a href="relnotes/10.0.4.html">10.0.4 release notes</a> diff --git a/mesalib/docs/relnotes/10.2.html b/mesalib/docs/relnotes/10.2.html index d7d557bd0..de9a535a7 100644 --- a/mesalib/docs/relnotes/10.2.html +++ b/mesalib/docs/relnotes/10.2.html @@ -45,8 +45,14 @@ Note: some of the new features are only available with certain drivers. <ul> <li>GL_ARB_buffer_storage on i965, r300, r600, and radeonsi</li> +<li>GL_ARB_sample_shading on nv50 (GT21x only), nvc0</li> <li>GL_ARB_stencil_texturing on i965/gen8+</li> +<li>GL_ARB_texture_cube_map_array on nv50 (GT21x only)</li> +<li>GL_ARB_texture_gather on nv50 (GT21x only), nvc0</li> +<li>GL_ARB_texture_query_lod on nv50 (GT21x only), nvc0</li> <li>GL_ARB_texture_view on i965/gen7</li> +<li>GL_ARB_vertex_type_10f_11f_11f_rev on nv50, nvc0, radeonsi</li> +<li>GL_ARB_viewport_array on nv50, r600</li> </ul> |