spirv: Drop the constant_as_global as option

[mesa.git] / src / compiler / meson.build

diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index e068a30a6bdd7f9c7e9c050f9cfabb13e2c2cde7..a74a630f0f90bc4c6bfb45b2e4a685771a2c1926 100644 (file)
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -45,8 +45,9 @@ libcompiler = static_library(
   'compiler',
   [files_libcompiler, ir_expression_operation_h],
   include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_include, inc_src, inc_gallium, inc_gallium_aux],
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+  c_args : [c_msvc_compat_args, no_override_init_args],
+  cpp_args : [cpp_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
   dependencies : [dep_valgrind],
   build_by_default : false,
 )
@@ -55,16 +56,45 @@ subdir('spirv')
 
 subdir('nir')
 
-# This is here because putting it in spirv/meson.build would create a circular
+# These are here because putting it in spirv/meson.build would create a circular
 # dependency with nir/meson.build.
 spirv2nir = executable(
   'spirv2nir',
   files('spirv/spirv2nir.c'),
   dependencies : [dep_m, idep_nir, idep_mesautil],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('spirv')],
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
+  c_args : [c_msvc_compat_args, no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
   build_by_default : with_tools.contains('nir'),
   install : with_tools.contains('nir'),
 )
 
+if with_tests
+  test(
+    'avail_vis',
+    executable(
+      'avail_vis',
+      files('spirv/tests/avail_vis.cpp'),
+      c_args : [c_msvc_compat_args, no_override_init_args],
+      gnu_symbol_visibility : 'hidden',
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+      dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
+    ),
+    suite : ['compiler', 'spirv'],
+  )
+
+  test(
+    'volatile',
+    executable(
+      'volatile',
+      files('spirv/tests/volatile.cpp'),
+      c_args : [c_msvc_compat_args, no_override_init_args],
+      gnu_symbol_visibility : 'hidden',
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+      dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
+    ),
+    suite : ['compiler', 'spirv'],
+  )
+endif
+
 subdir('glsl')