Import Mesa 20.1.6

2 files changed, 14 insertions, 3 deletions

diff --git a/lib/mesa/src/mapi/shared-glapi/glapi-symbols.txt b/lib/mesa/src/mapi/shared-glapi/glapi-symbols.txt
index c068e46fc..a30e21bcf 100644
--- a/lib/mesa/src/mapi/shared-glapi/glapi-symbols.txt
+++ b/lib/mesa/src/mapi/shared-glapi/glapi-symbols.txt
@@ -2,6 +2,7 @@ _glapi_Context
 _glapi_Dispatch
 _glapi_add_dispatch
 _glapi_check_multithread
+_glapi_destroy_multithread
 _glapi_get_context
 _glapi_get_dispatch
 _glapi_get_dispatch_table_size
diff --git a/lib/mesa/src/mapi/shared-glapi/meson.build b/lib/mesa/src/mapi/shared-glapi/meson.build
index 1847e1738..5b9db0c08 100644
--- a/lib/mesa/src/mapi/shared-glapi/meson.build
+++ b/lib/mesa/src/mapi/shared-glapi/meson.build
@@ -36,18 +36,28 @@ shared_glapi_mapi_tmp_h = custom_target(
   capture : true,
 )
 
+_glapi_c_args = []
+if with_platform_windows
+  _glapi_c_args += ['-D_GLAPI_DLL_EXPORTS']
+endif
+
 libglapi = shared_library(
   'glapi',
   [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
   c_args : [
-    c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_GLAPI',
+    _glapi_c_args,
+    c_msvc_compat_args,
+    c_vis_args,
+    '-DMAPI_MODE_GLAPI',
     '-DMAPI_ABI_HEADER="@0@"'.format(shared_glapi_mapi_tmp_h.full_path()),
     gcc_lto_quirk,
   ],
   link_args : [ld_args_gc_sections],
   include_directories : [inc_src, inc_include, inc_mapi],
   dependencies : [dep_thread, dep_selinux],
+  soversion : host_machine.system() == 'windows' ? '' : '0',
   version : '0.0.0',
+  name_prefix : 'lib',
   install : true,
 )
 
@@ -64,14 +74,14 @@ if with_any_opengl and with_tests
     ),
     suite : ['mapi'],
   )
-  if prog_nm.found()
+  if with_symbols_check
     test(
       'shared-glapi symbols check',
       symbols_check,
       args : [
         '--lib', libglapi,
         '--symbols-file', files('glapi-symbols.txt'),
-        '--nm', prog_nm.path(),
+        symbols_check_args,
       ],
       suite : ['mapi'],
     )