diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
| commit | 5f455179ae4b279a82d99a7a3dabe61f58c42ad6 (patch) | |
| tree | fdecec022cf1b8b782b90a64c14e374fa6d400cb /mesalib/docs/GL3.txt | |
| parent | 78d84bd03c744b0ed420c450dd2807904ccaef21 (diff) | |
| parent | 30af30b78075159fce477ae99cc72540133714d0 (diff) | |
| download | vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.gz vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.bz2 vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014
Conflicts:
X11/xtrans/Xtrans.c
xorg-server/dix/dispatch.c
xorg-server/os/xdmcp.c
Diffstat (limited to 'mesalib/docs/GL3.txt')
| -rw-r--r-- | mesalib/docs/GL3.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 0672ec708..799db4bc0 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -120,7 +120,7 @@ GL 4.1: GL_ARB_separate_shader_objects some infrastructure done GL_ARB_shader_precision not started GL_ARB_vertex_attrib_64bit not started - GL_ARB_viewport_array not started + GL_ARB_viewport_array DONE (i965) GL 4.2: @@ -142,7 +142,7 @@ GL 4.2: GL 4.3: GLSL 4.3 not started - GL_ARB_arrays_of_arrays 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 |