nir/vtn: Use return type rather than image type for tex ops

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

diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index 81d0fbea521185e21d7172fc833f943228f859db..e59630590b96637a4c869c7b2d689da0f3efee7a 100644 (file)
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -41,7 +41,7 @@ ir_expression_operation_constant_h = custom_target(
   'ir_expression_operation_constant.h',
   input : 'ir_expression_operation.py',
   output : 'ir_expression_operation_constant.h',
-  command : [prog_python2, '@INPUT@', 'constant'],
+  command : [prog_python, '@INPUT@', 'constant'],
   capture : true,
 )
 
@@ -49,10 +49,17 @@ ir_expression_operation_strings_h = custom_target(
   'ir_expression_operation_strings.h',
   input : 'ir_expression_operation.py',
   output : 'ir_expression_operation_strings.h',
-  command : [prog_python2, '@INPUT@', 'strings'],
+  command : [prog_python, '@INPUT@', 'strings'],
   capture : true,
 )
 
+float64_glsl_h = custom_target(
+  'float64_glsl.h',
+  input : ['xxd.py', 'float64.glsl'],
+  output : 'float64_glsl.h',
+  command : [prog_python, '@INPUT@', '@OUTPUT@', '-n', 'float64_source'],
+)
+
 files_libglsl = files(
   'ast.h',
   'ast_array_index.cpp',
@@ -67,10 +74,15 @@ files_libglsl = files(
   'builtin_variables.cpp',
   'generate_ir.cpp',
   'gl_nir_lower_atomics.c',
+  'gl_nir_lower_images.c',
+  'gl_nir_lower_buffers.c',
   'gl_nir_lower_samplers.c',
   'gl_nir_lower_samplers_as_deref.c',
+  'gl_nir_link_atomics.c',
+  'gl_nir_link_uniform_blocks.c',
   'gl_nir_link_uniform_initializers.c',
   'gl_nir_link_uniforms.c',
+  'gl_nir_link_xfb.c',
   'gl_nir_linker.c',
   'gl_nir_linker.h',
   'gl_nir.h',
@@ -135,6 +147,7 @@ files_libglsl = files(
   'lower_blend_equation_advanced.cpp',
   'lower_buffer_access.cpp',
   'lower_buffer_access.h',
+  'lower_builtins.cpp',
   'lower_const_arrays_to_uniforms.cpp',
   'lower_cs_derived.cpp',
   'lower_discard.cpp',
@@ -145,11 +158,11 @@ files_libglsl = files(
   'lower_int64.cpp',
   'lower_jumps.cpp',
   'lower_mat_op_to_vec.cpp',
-  'lower_noise.cpp',
   'lower_offset_array.cpp',
   'lower_packed_varyings.cpp',
   'lower_named_interface_blocks.cpp',
   'lower_packing_builtins.cpp',
+  'lower_precision.cpp',
   'lower_subroutine.cpp',
   'lower_tess_level.cpp',
   'lower_texture_projection.cpp',
@@ -163,13 +176,13 @@ files_libglsl = files(
   'lower_output_reads.cpp',
   'lower_shared_reference.cpp',
   'lower_ubo_reference.cpp',
+  'lower_xfb_varying.cpp',
   'opt_algebraic.cpp',
   'opt_array_splitting.cpp',
   'opt_conditional_discard.cpp',
   'opt_constant_folding.cpp',
   'opt_constant_propagation.cpp',
   'opt_constant_variable.cpp',
-  'opt_copy_propagation.cpp',
   'opt_copy_propagation_elements.cpp',
   'opt_dead_builtin_variables.cpp',
   'opt_dead_builtin_varyings.cpp',
@@ -212,11 +225,13 @@ files_libglsl_standalone = files(
 libglsl = static_library(
   'glsl',
   [files_libglsl, glsl_parser, glsl_lexer_cpp, ir_expression_operation_h,
-   ir_expression_operation_strings_h, ir_expression_operation_constant_h],
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+   ir_expression_operation_strings_h, ir_expression_operation_constant_h,
+   float64_glsl_h],
+  c_args : [c_msvc_compat_args, no_override_init_args],
+  cpp_args : [cpp_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
   link_with : libglcpp,
-  include_directories : [inc_common, inc_compiler, inc_nir],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler],
   dependencies : idep_nir,
   build_by_default : false,
 )
@@ -224,21 +239,23 @@ libglsl = static_library(
 libglsl_standalone = static_library(
   'glsl_standalone',
   [files_libglsl_standalone, ir_expression_operation_h],
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common],
-  link_with : [libglsl, libglsl_util, libmesa_util],
-  dependencies : [dep_thread],
+  c_args : [c_msvc_compat_args, no_override_init_args],
+  cpp_args : [cpp_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  link_with : [libglsl, libglsl_util, libglcpp_standalone],
+  dependencies : [idep_mesautil, idep_getopt],
   build_by_default : false,
 )
 
 glsl_compiler = executable(
   'glsl_compiler',
   'main.cpp',
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  dependencies : [dep_clock, dep_thread],
-  include_directories : [inc_common],
+  c_args : [c_msvc_compat_args, no_override_init_args],
+  cpp_args : [cpp_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
+  dependencies : [dep_clock, dep_thread, idep_getopt],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : [libglsl_standalone],
   build_by_default : with_tools.contains('glsl'),
   install : with_tools.contains('glsl'),
@@ -248,15 +265,16 @@ glsl_test = executable(
   'glsl_test',
   ['test.cpp', 'test_optpass.cpp', 'test_optpass.h',
    ir_expression_operation_h],
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common],
-  dependencies : [dep_clock, dep_thread],
+  c_args : [c_msvc_compat_args, no_override_init_args],
+  cpp_args : [cpp_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  dependencies : [dep_clock, dep_thread, idep_getopt],
   link_with : [libglsl, libglsl_standalone, libglsl_util],
   build_by_default : with_tools.contains('glsl'),
   install : with_tools.contains('glsl'),
 )
 
-if with_tests
+if with_any_opengl and with_tests
   subdir('tests')
 endif