diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 20:12:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 20:12:35 +0200 |
| commit | 19b4b68b35a047a83bd291ee8debac1adb0e946c (patch) | |
| tree | d4d4520622ecf73fa0d076dc0bf517a1189b7d9f /mesalib/docs/GL3.txt | |
| parent | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (diff) | |
| parent | 438af0c7d4bf60b408b259c88205ff2193195466 (diff) | |
| download | vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.gz vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.tar.bz2 vcxsrv-19b4b68b35a047a83bd291ee8debac1adb0e946c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/macros.h
xorg-server/dix/registry.c
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/xwin/Makefile.am
xorg-server/hw/xwin/glx/.gitignore
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/windisplay.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winprefs.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 f5d5e72c9..5adc7598c 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -138,7 +138,7 @@ GL 4.2, GLSL 4.20: GL_ARB_shader_atomic_counters DONE (i965) GL_ARB_texture_storage DONE (all drivers) GL_ARB_transform_feedback_instanced DONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, radeonsi) + GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) GL_ARB_shader_image_load_store in progress (curro) GL_ARB_conservative_depth DONE (all drivers that support GLSL 1.30) GL_ARB_shading_language_420pack DONE (all drivers that support GLSL 1.30) @@ -168,7 +168,7 @@ GL 4.3, GLSL 4.30: GL_ARB_texture_buffer_range DONE (nv50, nvc0, i965, r600, radeonsi, llvmpipe) GL_ARB_texture_query_levels DONE (all drivers that support GLSL 1.30) GL_ARB_texture_storage_multisample DONE (all drivers that support GL_ARB_texture_multisample) - GL_ARB_texture_view DONE (i965) + GL_ARB_texture_view DONE (i965, nv50, nvc0) GL_ARB_vertex_attrib_binding DONE (all drivers) |