intel/isl: Update mocs for DG1

[mesa.git] / src / intel / isl / meson.build

diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 91447614c9fb46e821483ea4319acb4f9806e5c4..66f19039ce2fa1e22e924c4b60facda71ec1f05f 100644 (file)
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -62,9 +62,12 @@ foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
   isl_gen_libs += static_library(
     'isl_gen@0@'.format(_gen),
     [g[1], isl_gen_files, gen_xml_pack],
-    include_directories : [inc_common, inc_intel],
-    c_args : [c_vis_args, no_override_init_args,
-              '-DGEN_VERSIONx10=@0@'.format(_gen)],
+    include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
+    c_args : [
+      no_override_init_args,
+      '-DGEN_VERSIONx10=@0@'.format(_gen)
+    ],
+    gnu_symbol_visibility : 'hidden',
   )
 endforeach
 
@@ -87,9 +90,10 @@ isl_tiled_memcpy = static_library(
   'isl_tiled_memcpy',
   [files_isl_tiled_memcpy],
   include_directories : [
-    inc_common, inc_intel, inc_include,
+    inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
   ],
-  c_args : [c_vis_args, no_override_init_args, '-msse2'],
+  c_args : [no_override_init_args, '-msse2'],
+  gnu_symbol_visibility : 'hidden',
   extra_files : ['isl_tiled_memcpy.c']
 )
 
@@ -98,10 +102,11 @@ if with_sse41
     'isl_tiled_memcpy_sse41',
     [files_isl_tiled_memcpy_sse41],
     include_directories : [
-      inc_common, inc_intel, inc_include,
+      inc_include, inc_src, inc_mesa, inc_gallium, inc_intel,
     ],
     link_args : ['-Wl,--exclude-libs=ALL'],
-    c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args],
+    c_args : [no_override_init_args, '-msse2', sse41_args],
+    gnu_symbol_visibility : 'hidden',
     extra_files : ['isl_tiled_memcpy.c']
   )
 else
@@ -122,9 +127,10 @@ libisl_files = files(
 libisl = static_library(
   'isl',
   [libisl_files, isl_format_layout_c, genX_bits_h],
-  include_directories : [inc_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
   link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
-  c_args : [c_vis_args, no_override_init_args],
+  c_args : [no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
 )
 
 if with_tests
@@ -134,7 +140,7 @@ if with_tests
       'isl_surf_get_image_offset_test',
       'tests/isl_surf_get_image_offset_test.c',
       dependencies : [dep_m, idep_mesautil],
-      include_directories : [inc_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
       link_with : [libisl, libintel_dev],
     ),
     suite : ['intel'],
@@ -148,7 +154,7 @@ if with_tests
         'isl_aux_info.c',
       ],
       dependencies : [dep_m, idep_gtest, idep_mesautil],
-      include_directories : [inc_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_gallium, inc_intel],
       c_args : '-DIN_UNIT_TEST',
       cpp_args : '-DIN_UNIT_TEST',
     ),