aboutsummaryrefslogtreecommitdiff
path: root/mesalib/docs/GL3.txt
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-12 13:48:18 +0000
committermarha <marha@users.sourceforge.net>2011-04-12 13:48:18 +0000
commite2c8d047679db3bbb166d709b86e18180be6d713 (patch)
treed7468ac76dc71bb8d38c816be6db988bcbcbb863 /mesalib/docs/GL3.txt
parent57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff)
parent7730393619080086530e24d3b594351b4114f608 (diff)
downloadvcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz
vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2
vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/docs/GL3.txt')
-rw-r--r--mesalib/docs/GL3.txt2
1 files changed, 1 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)