mesa: enable ARB_shading_language_include

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/999
Reviewed-by: Witold Baryluk <witold.baryluk@gmail.com>

diff --git a/docs/features.txt b/docs/features.txt
index 14eb2ad48f23fd62431460649592d51675526e98..35780038fe8ced6d5ca0187556d10df4736658e4 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -311,6 +311,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
   GL_ARB_shader_clock                                   DONE (i965/gen7+, nv50, nvc0, r600, radeonsi, virgl)
   GL_ARB_shader_stencil_export                          DONE (i965/gen9+, r600, radeonsi, softpipe, llvmpipe, swr, virgl)
   GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+, nvc0, radeonsi)
+  GL_ARB_shading_language_include                       DONE
   GL_ARB_sparse_buffer                                  DONE (radeonsi/CIK+)
   GL_ARB_sparse_texture                                 not started
   GL_ARB_sparse_texture2                                not started
@@ -408,7 +409,6 @@ we DO NOT WANT implementations of these extensions for Mesa.
 
   GL_ARB_geometry_shader4                               Superseded by GL 3.2 geometry shaders
   GL_ARB_matrix_palette                                 Superseded by GL_ARB_vertex_program
-  GL_ARB_shading_language_include                       Not interesting
   GL_ARB_shadow_ambient                                 Superseded by GL_ARB_fragment_program
   GL_ARB_vertex_blend                                   Superseded by GL_ARB_vertex_program
 

diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index eb05302d68f8ff77054be6d5c5989a8edefa495e..2402f34f5616e70394437234de039aa17d0a20e7 100644 (file)
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -137,7 +137,7 @@ EXT(ARB_shader_texture_lod                  , ARB_shader_texture_lod
 EXT(ARB_shader_viewport_layer_array         , ARB_shader_viewport_layer_array        , GLL, GLC,  x ,  x , 2015)
 EXT(ARB_shading_language_100                , dummy_true                             , GLL,  x ,  x ,  x , 2003)
 EXT(ARB_shading_language_420pack            , ARB_shading_language_420pack           , GLL, GLC,  x ,  x , 2011)
-EXT(ARB_shading_language_include            , dummy_false                            , GLL, GLC,  x ,  x , 2013)
+EXT(ARB_shading_language_include            , dummy_true                             , GLL, GLC,  x ,  x , 2013)
 EXT(ARB_shading_language_packing            , ARB_shading_language_packing           , GLL, GLC,  x ,  x , 2011)
 EXT(ARB_shadow                              , ARB_shadow                             , GLL,  x ,  x ,  x , 2001)
 EXT(ARB_sparse_buffer                       , ARB_sparse_buffer                      , GLL, GLC,  x ,  x , 2014)