diff options
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/auxiliary/meson.build | 6 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/meson.build | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r600/meson.build | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/meson.build | 2 | ||||
-rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/meson.build | 8 | ||||
-rw-r--r-- | src/gallium/drivers/swr/rasterizer/core/backends/meson.build | 4 | ||||
-rw-r--r-- | src/gallium/drivers/swr/rasterizer/jitter/meson.build | 6 |
7 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 98542d7ef3e..858c9d0c79c 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -504,7 +504,7 @@ u_indices_gen_c = custom_target( 'u_indices_gen.c', input : 'indices/u_indices_gen.py', output : 'u_indices_gen.c', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, ) @@ -512,7 +512,7 @@ u_unfilled_gen_c = custom_target( 'u_unfilled_gen.c', input : 'indices/u_unfilled_gen.py', output : 'u_unfilled_gen.c', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, ) @@ -520,7 +520,7 @@ u_format_table_c = custom_target( 'u_format_table.c', input : ['util/u_format_table.py', 'util/u_format.csv'], output : 'u_format_table.c', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], depend_files : files('util/u_format_pack.py', 'util/u_format_parse.py'), capture : true, ) diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index 5cc19755ddc..7415dc9efff 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -23,7 +23,7 @@ ir3_nir_trig_c = custom_target( input : 'ir3/ir3_nir_trig.py', output : 'ir3_nir_trig.c', command : [ - prog_python2, '@INPUT@', + prog_python, '@INPUT@', '-p', join_paths(meson.source_root(), 'src/compiler/nir/'), ], capture : true, diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build index 5899518a2e8..4f10994d6bc 100644 --- a/src/gallium/drivers/r600/meson.build +++ b/src/gallium/drivers/r600/meson.build @@ -109,7 +109,7 @@ egd_tables_h = custom_target( 'egd_tables.h', input : ['egd_tables.py', 'evergreend.h'], output : 'egd_tables.h', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, ) diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build index 9e249adc61e..f943b61ebff 100644 --- a/src/gallium/drivers/radeonsi/meson.build +++ b/src/gallium/drivers/radeonsi/meson.build @@ -91,7 +91,7 @@ si_driinfo_h = custom_target( '../../auxiliary/pipe-loader/driinfo_gallium.h', 'driinfo_radeonsi.h' ), output : 'si_driinfo.h', - command : [prog_python2, '@INPUT@'], + command : [prog_python, '@INPUT@'], capture : true, ) diff --git a/src/gallium/drivers/swr/rasterizer/codegen/meson.build b/src/gallium/drivers/swr/rasterizer/codegen/meson.build index 841540e0f30..28275176022 100644 --- a/src/gallium/drivers/swr/rasterizer/codegen/meson.build +++ b/src/gallium/drivers/swr/rasterizer/codegen/meson.build @@ -22,7 +22,7 @@ gen_knobs_cpp = custom_target( 'gen_knobs.cpp', input : ['gen_knobs.py'], output : 'gen_knobs.cpp', - command : [prog_python2, '@INPUT0@', '--output', '@OUTPUT@', '--gen_cpp'], + command : [prog_python, '@INPUT0@', '--output', '@OUTPUT@', '--gen_cpp'], depend_files : files( 'knob_defs.py', 'gen_common.py', 'templates/gen_knobs.cpp', @@ -33,7 +33,7 @@ gen_knobs_h = custom_target( 'gen_knobs.h', input : ['gen_knobs.py'], output : 'gen_knobs.h', - command : [prog_python2, '@INPUT0@', '--output', '@OUTPUT@', '--gen_h'], + command : [prog_python, '@INPUT0@', '--output', '@OUTPUT@', '--gen_h'], depend_files : files( 'knob_defs.py', 'gen_common.py', 'templates/gen_knobs.h', @@ -53,7 +53,7 @@ foreach x : [[swr_context_files, 'gen_swr_context_llvm.h'], x[1], input : ['gen_llvm_types.py', x[0]], output : x[1], - command : [prog_python2, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@'], + command : [prog_python, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@'], depend_files : files( 'templates/gen_llvm.hpp', 'gen_common.py', @@ -70,7 +70,7 @@ foreach x : [['gen_ar_event.hpp', '--gen_event_hpp'], input : ['gen_archrast.py', swr_event_proto_files, swr_event_pproto_files], output : x[0], command : [ - prog_python2, + prog_python, '@INPUT0@', '--proto', '@INPUT1@', '--proto_private', '@INPUT2@', diff --git a/src/gallium/drivers/swr/rasterizer/core/backends/meson.build b/src/gallium/drivers/swr/rasterizer/core/backends/meson.build index 80b62174a6b..d64715dc8be 100644 --- a/src/gallium/drivers/swr/rasterizer/core/backends/meson.build +++ b/src/gallium/drivers/swr/rasterizer/core/backends/meson.build @@ -28,7 +28,7 @@ files_swr_common += custom_target( 'gen_BackendPixelRate.hpp', ], command : [ - prog_python2, '@INPUT@', + prog_python, '@INPUT@', '--outdir', '@OUTDIR@', '--dim', '5', '2', '3', '2', '2', '2', '--numfiles', '4', @@ -46,7 +46,7 @@ files_swr_common += custom_target( 'gen_rasterizer.hpp', ], command : [ - prog_python2, '@INPUT@', + prog_python, '@INPUT@', '--outdir', '@OUTDIR@', '--rast', '--dim', '5', '2', '2', '3', '5', '2', diff --git a/src/gallium/drivers/swr/rasterizer/jitter/meson.build b/src/gallium/drivers/swr/rasterizer/jitter/meson.build index 5c201990b50..aced4a1b735 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/meson.build +++ b/src/gallium/drivers/swr/rasterizer/jitter/meson.build @@ -30,7 +30,7 @@ gen_builder_hpp = custom_target( ], output : 'gen_builder.hpp', command : [ - prog_python2, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@', + prog_python, '@INPUT0@', '--input', '@INPUT1@', '--output', '@OUTPUT@', '--gen_h', '--output-dir', '@OUTDIR@' ], depend_files : swr_gen_builder_depends, @@ -42,7 +42,7 @@ gen_builder_meta_hpp = custom_target( input : '../codegen/gen_llvm_ir_macros.py', output : 'gen_builder_meta.hpp', command : [ - prog_python2, '@INPUT0@', '--gen_meta_h', '--output', '@OUTPUT@', + prog_python, '@INPUT0@', '--gen_meta_h', '--output', '@OUTPUT@', '--output-dir', '@OUTDIR@' ], depend_files : swr_gen_builder_depends, @@ -53,7 +53,7 @@ gen_builder_intrin_hpp = custom_target( input : '../codegen/gen_llvm_ir_macros.py', output : 'gen_builder_intrin.hpp', command : [ - prog_python2, '@INPUT0@', '--gen_intrin_h', '--output', '@OUTPUT@', + prog_python, '@INPUT0@', '--gen_intrin_h', '--output', '@OUTPUT@', '--output-dir', '@OUTDIR@' ], depend_files : swr_gen_builder_depends, |