diff options
author | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-11 12:00:44 +0200 |
commit | db967c2b0fd8506b9e1cf7574d5fb927bec786c5 (patch) | |
tree | 5444de1e304af7b5ae8c4b590a08b1b5964c7eca /mesalib/docs/GL3.txt | |
parent | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (diff) | |
parent | 0bef135026040688be97af98cc99cc82f93838e8 (diff) | |
download | vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.gz vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.bz2 vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/devices.c
Diffstat (limited to 'mesalib/docs/GL3.txt')
-rw-r--r-- | mesalib/docs/GL3.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 36d24725d..8357289ea 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -42,8 +42,8 @@ GLX_ARB_create_context (GLX 1.4 is required) DONE GL 3.1: -GLSL 1.40 missing: UBOS, inverse(), - highp change +GLSL 1.40 needs UBOs (in progress) +Forward compatibile context support/deprecations not started Instanced drawing (GL_ARB_draw_instanced) DONE (i965, gallium, swrast) Buffer copying (GL_ARB_copy_buffer) DONE (i965, r300, r600, swrast) Primitive restart (GL_NV_primitive_restart) DONE (i965, r600) @@ -80,7 +80,7 @@ GL_ARB_sampler_objects DONE (i965, r300, r600) GL_ARB_shader_bit_encoding DONE GL_ARB_texture_rgb10_a2ui DONE (r600) GL_ARB_texture_swizzle DONE (same as EXT version) (i965, r300, r600, swrast) -GL_ARB_timer_query ~60% done (the EXT variant) +GL_ARB_timer_query DONE GL_ARB_instanced_arrays DONE (i965, r300, r600) GL_ARB_vertex_type_2_10_10_10_rev DONE (r600) @@ -91,6 +91,7 @@ GLSL 4.0 not started GL_ARB_texture_query_lod not started GL_ARB_draw_buffers_blend DONE (i965, r600, softpipe) GL_ARB_draw_indirect not started +GL_ARB_gpu_shader5 not started GL_ARB_gpu_shader_fp64 not started GL_ARB_sample_shading not started GL_ARB_shader_subroutine not started @@ -114,6 +115,7 @@ GL_ARB_viewport_array not started GL 4.2: + GLSL 4.2 not started GL_ARB_texture_compression_bptc not started GL_ARB_compressed_texture_pixel_storage not started |