diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
| commit | e2c8d047679db3bbb166d709b86e18180be6d713 (patch) | |
| tree | d7468ac76dc71bb8d38c816be6db988bcbcbb863 /mesalib/docs | |
| parent | 57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff) | |
| parent | 7730393619080086530e24d3b594351b4114f608 (diff) | |
| download | vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2 vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/docs')
| -rw-r--r-- | mesalib/docs/GL3.txt | 2 | ||||
| -rw-r--r-- | mesalib/docs/relnotes-7.11.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 6d65c7952..b11f6aa5f 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -77,7 +77,7 @@ GLSL 3.30 not started GL_ARB_blend_func_extended not started
GL_ARB_explicit_attrib_location DONE (swrast, i915, i965)
GL_ARB_occlusion_query2 DONE (swrast, gallium)
-GL_ARB_sampler_objects not started
+GL_ARB_sampler_objects DONE (gallium)
GL_ARB_texture_rgb10_a2ui not started
GL_ARB_texture_swizzle DONE (same as EXT version)
GL_ARB_timer_query DONE (only Xlib sw driver)
diff --git a/mesalib/docs/relnotes-7.11.html b/mesalib/docs/relnotes-7.11.html index 9c34775c2..4ac32e7e8 100644 --- a/mesalib/docs/relnotes-7.11.html +++ b/mesalib/docs/relnotes-7.11.html @@ -41,6 +41,7 @@ tbd <li>GL_ARB_texture_compression_rgtc (gallium r600, swrast)
<li>GL_ARB_draw_buffers_blend (gallium)
<li>GL_EXT_texture_sRGB_decode (gallium drivers, swrast, i965)
+<li>GL_ARB_sampler_objects (gallium drivers)
</ul>
|