diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
| commit | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (patch) | |
| tree | a524a96442c2a28243826f91f43680f4bcf012d3 /mesalib/docs/GL3.txt | |
| parent | 8d44af7cf8bdc4f42223dfef737ebf4e8c7fe55e (diff) | |
| parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
| download | vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.gz vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.bz2 vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/docs/GL3.txt')
| -rw-r--r-- | mesalib/docs/GL3.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 5adc7598c..07d1d2c49 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -110,7 +110,7 @@ GL 4.0, GLSL 4.00: - Interpolation functions DONE () - New overload resolution rules DONE GL_ARB_gpu_shader_fp64 started (Dave) - GL_ARB_sample_shading DONE (i965, nv50, nvc0, radeonsi) + GL_ARB_sample_shading DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader started (Chris, Ilia) GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) |