Reviewed-by: Marek Olšák <marek.ol...@amd.com> Marek
On Thu, Aug 7, 2014 at 7:35 PM, Matt Turner <matts...@gmail.com> wrote: > Listing the GLSL version as an individual component of a GL version, > separate from the extensions isn't really right. The GLSL changes are > (almost?) entirely comprised of changes listed in the extensions. > --- > docs/GL3.txt | 27 +++++++++------------------ > 1 file changed, 9 insertions(+), 18 deletions(-) > > diff --git a/docs/GL3.txt b/docs/GL3.txt > index e241257..7f18cd7 100644 > --- a/docs/GL3.txt > +++ b/docs/GL3.txt > @@ -18,9 +18,8 @@ are exposed in the 3.0 context as extensions. > Feature Status > ----------------------------------------------------- > ------------------------ > > -GL 3.0 --- all DONE: i965, nv50, nvc0, r600, radeonsi > +GL 3.0, GLSL 1.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi > > - GLSL 1.30 DONE () > glBindFragDataLocation, glGetFragDataLocation DONE > Conditional rendering (GL_NV_conditional_render) DONE (r300, swrast) > Map buffer subranges (GL_ARB_map_buffer_range) DONE (r300, swrast) > @@ -49,9 +48,8 @@ GL 3.0 --- all DONE: i965, nv50, nvc0, r600, radeonsi > Multisample anti-aliasing DONE (r300) > > > -GL 3.1 --- all DONE: i965, nv50, nvc0, r600, radeonsi > +GL 3.1, GLSL 1.40 --- all DONE: i965, nv50, nvc0, r600, radeonsi > > - GLSL 1.40 DONE () > Forward compatible context support/deprecations DONE () > Instanced drawing (GL_ARB_draw_instanced) DONE (swrast) > Buffer copying (GL_ARB_copy_buffer) DONE (r300, swrast) > @@ -63,10 +61,9 @@ GL 3.1 --- all DONE: i965, nv50, nvc0, r600, radeonsi > Signed normalized textures (GL_EXT_texture_snorm) DONE (r300) > > > -GL 3.2 --- all DONE: i965, nv50, nvc0, r600, radeonsi > +GL 3.2, GLSL 1.50 --- all DONE: i965, nv50, nvc0, r600, radeonsi > > Core/compatibility profiles DONE > - GLSL 1.50 DONE () > Geometry shaders DONE () > BGRA vertex order (GL_ARB_vertex_array_bgra) DONE (r300, swrast) > Base vertex offset(GL_ARB_draw_elements_base_vertex) DONE (r300, swrast) > @@ -79,9 +76,8 @@ GL 3.2 --- all DONE: i965, nv50, nvc0, r600, radeonsi > GLX_ARB_create_context_profile DONE > > > -GL 3.3 --- all DONE: i965, nv50, nvc0, r600, radeonsi > +GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi > > - GLSL 3.30 DONE () > GL_ARB_blend_func_extended DONE (softpipe) > GL_ARB_explicit_attrib_location DONE (all drivers > that support GLSL) > GL_ARB_occlusion_query2 DONE (r300, swrast) > @@ -94,9 +90,8 @@ GL 3.3 --- all DONE: i965, nv50, nvc0, r600, radeonsi > GL_ARB_vertex_type_2_10_10_10_rev DONE () > > > -GL 4.0: > +GL 4.0, GLSL 4.00: > > - GLSL 4.0 not started > GL_ARB_draw_buffers_blend DONE (i965, nv50, > nvc0, r600, radeonsi, softpipe) > GL_ARB_draw_indirect DONE (i965, nvc0, > radeonsi, softpipe, llvmpipe) > GL_ARB_gpu_shader5 started > @@ -124,9 +119,8 @@ GL 4.0: > GL_ARB_transform_feedback3 DONE (i965, nv50, > nvc0, r600, radeonsi) > > > -GL 4.1: > +GL 4.1, GLSL 4.10: > > - GLSL 4.1 not started > GL_ARB_ES2_compatibility DONE (i965, nv50, > nvc0, r300, r600, radeonsi) > GL_ARB_get_program_binary DONE (0 binary > formats) > GL_ARB_separate_shader_objects DONE (all drivers) > @@ -135,9 +129,8 @@ GL 4.1: > GL_ARB_viewport_array DONE (i965, nv50, > nvc0, r600) > > > -GL 4.2: > +GL 4.2, GLSL 4.20: > > - GLSL 4.2 not started > GL_ARB_texture_compression_bptc not started > GL_ARB_compressed_texture_pixel_storage DONE (all drivers) > GL_ARB_shader_atomic_counters DONE (i965) > @@ -151,9 +144,8 @@ GL 4.2: > GL_ARB_map_buffer_alignment DONE (all drivers) > > > -GL 4.3: > +GL 4.3, GLSL 4.30: > > - GLSL 4.3 not started > GL_ARB_arrays_of_arrays started (Timothy) > GL_ARB_ES3_compatibility DONE (i965) > GL_ARB_clear_buffer_object DONE (all drivers) > @@ -178,9 +170,8 @@ GL 4.3: > GL_ARB_vertex_attrib_binding DONE (all drivers) > > > -GL 4.4: > +GL 4.4, GLSL 4.40: > > - GLSL 4.4 not started > GL_MAX_VERTEX_ATTRIB_STRIDE not started > GL_ARB_buffer_storage DONE (i965, nv30, > nv50, nvc0, r300, r600, radeonsi) > GL_ARB_clear_texture DONE (i965) > -- > 1.8.5.5 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev