mesa: only allow EXT_gpu_shader4 in the compatibility profile
authorMarek Olšák <marek.olsak@amd.com>
Tue, 21 Aug 2018 03:42:22 +0000 (23:42 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Thu, 25 Apr 2019 00:45:15 +0000 (20:45 -0400)
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
src/mesa/main/extensions_table.h

index 21903e52af6a9b9666914e8321204cdb6e4c0bfa..717f64612ff93a4be42602c7856aba9d1c84da8a 100644 (file)
@@ -240,7 +240,9 @@ EXT(EXT_framebuffer_sRGB                    , EXT_framebuffer_sRGB
 EXT(EXT_geometry_point_size                 , OES_geometry_shader                    ,  x ,  x ,  x ,  31, 2015)
 EXT(EXT_geometry_shader                     , OES_geometry_shader                    ,  x ,  x ,  x ,  31, 2015)
 EXT(EXT_gpu_program_parameters              , EXT_gpu_program_parameters             , GLL,  x ,  x ,  x , 2006)
-EXT(EXT_gpu_shader4                         , EXT_gpu_shader4                        , GLL, GLC,  x ,  x , 2006)
+/* Since all of EXT_gpu_shader4 features were rolled into GLSL 1.40, it shouldn't be exposed in a core context.
+ * Additionally, EXT_gpu_shader4 would reintroduce functions that were removed in GLSL 1.40. */
+EXT(EXT_gpu_shader4                         , EXT_gpu_shader4                        , GLL,  x ,  x ,  x , 2006)
 EXT(EXT_gpu_shader5                         , ARB_gpu_shader5                        ,  x ,  x ,  x ,  31, 2014)
 EXT(EXT_map_buffer_range                    , ARB_map_buffer_range                   ,  x ,  x , ES1, ES2, 2012)
 EXT(EXT_memory_object                       , EXT_memory_object                      , GLL, GLC,  x , ES2, 2017)