From 28bee9fbdda2176840c5dd013cf398de58fb8abc Mon Sep 17 00:00:00 2001 From: Ella Stanforth Date: Tue, 12 Aug 2025 11:52:15 +0100 Subject: [PATCH] pco: Cleanup meson.build files Signed-off-by: Ella Stanforth Acked-by: Erik Faye-Lund Part-of: --- src/imagination/pco/uscgen/meson.build | 3 +-- src/imagination/pco/usclib/meson.build | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/imagination/pco/uscgen/meson.build b/src/imagination/pco/uscgen/meson.build index 49109b07b52..c4285aecc12 100644 --- a/src/imagination/pco/uscgen/meson.build +++ b/src/imagination/pco/uscgen/meson.build @@ -13,7 +13,7 @@ else include_directories : [inc_imagination, inc_include, inc_src], c_args : [pre_args, no_override_init_args], link_args : [ld_args_build_id], - dependencies : [idep_mesaclc, dep_llvm, dep_spirv_tools, idep_nir, idep_mesautil], + dependencies : [idep_vtn, idep_nir, idep_mesautil], # If we can run host binaries directly, just build pco_clc for the host. # Most commonly this happens when doing a cross compile from an x86_64 build # machine to an x86 host @@ -37,7 +37,6 @@ pco_uscgen_programs = custom_target( input : pco_usclib_spv, output : ['pco_uscgen_programs.h', 'pco_uscgen_programs.c'], command : [prog_pco_clc, pco_usclib_spv, '@OUTPUT@', uscgen_devices], - env: ['MESA_SHADER_CACHE_DISABLE=true'], ) idep_pco_uscgen_programs_h = declare_dependency( diff --git a/src/imagination/pco/usclib/meson.build b/src/imagination/pco/usclib/meson.build index ac3524e5e16..7ef94e63c13 100644 --- a/src/imagination/pco/usclib/meson.build +++ b/src/imagination/pco/usclib/meson.build @@ -6,10 +6,6 @@ pco_usclib_shader_files = files( 'sync.cl', ) -# We need to set -fmacro-prefix-map properly for reproducability. -fs = import('fs') -relative_dir = fs.relative_to(meson.global_source_root(), meson.global_build_root()) + '/' - pco_usclib_spv = custom_target( 'pco_usclib.spv', input : pco_usclib_shader_files, @@ -18,14 +14,12 @@ pco_usclib_spv = custom_target( prog_mesa_clc, '-o', '@OUTPUT@', '--depfile', '@DEPFILE@', pco_usclib_shader_files, '--', - '-cl-std=cl2.0', '-D__OPENCL_VERSION__=200', '-I' + join_paths(meson.project_source_root(), 'include'), '-I' + join_paths(meson.project_source_root(), 'src/compiler/libcl'), '-I' + join_paths(meson.current_source_dir(), '.'), '-I' + join_paths(meson.current_source_dir(), '../../../'), - '-fmacro-prefix-map=@0@='.format(relative_dir), - ], - env: ['MESA_SHADER_CACHE_DISABLE=true'], + cl_args, + ], depfile : 'pco_usclib.h.d', )