nir/drawpixels: handle load_color0, load_input, load_interpolated_input

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

diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index da2464d7b8c323b9e887cde51dfacaec8795240c..9dfcb3449efb1829bbbc415dfa0e619bc3888e8d 100644 (file)
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -19,13 +19,10 @@
 # SOFTWARE.
 
 inc_compiler = include_directories('.')
-inc_nir = include_directories('nir')
 inc_glsl = include_directories('glsl')
 inc_spirv = include_directories('spirv')
 
 files_libcompiler = files(
-  'blob.c',
-  'blob.h',
   'builtin_type_macros.h',
   'glsl_types.cpp',
   'glsl_types.h',
@@ -40,7 +37,7 @@ ir_expression_operation_h = custom_target(
   'ir_expression_operation.h',
   input : 'glsl/ir_expression_operation.py',
   output : 'ir_expression_operation.h',
-  command : [prog_python2, '@INPUT@', 'enum'],
+  command : [prog_python, '@INPUT@', 'enum'],
   capture : true,
 )
 
@@ -62,10 +59,9 @@ subdir('nir')
 # dependency with nir/meson.build.
 spirv2nir = executable(
   'spirv2nir',
-  [files('spirv/spirv2nir.c'), dummy_cpp],
-  dependencies : [dep_m, dep_thread, idep_nir],
-  include_directories : [inc_common, inc_nir, include_directories('spirv')],
-  link_with : libmesa_util,
+  files('spirv/spirv2nir.c'),
+  dependencies : [dep_m, idep_nir, idep_mesautil],
+  include_directories : [inc_common, include_directories('spirv')],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   build_by_default : with_tools.contains('nir'),
   install : with_tools.contains('nir'),