From 8f387570678d1fd0d1a9f0f8a3b7bddc935e1d78 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Tue, 20 Feb 2024 12:41:18 -0800 Subject: [PATCH] intel/meson: Remove usage of meson.source_root and meson.build_root Both are deprecated and the alternatives are already being used in the project, so start using those here too: ``` ../src/intel/shaders/meson.build:64: WARNING: Project targets '>= 1.1.0' but uses feature deprecated since '0.56.0': meson.source_root. use meson.project_source_root() or meson.global_source_root() instead. ../src/intel/shaders/meson.build:65: WARNING: Project targets '>= 1.1.0' but uses feature deprecated since '0.56.0': meson.build_root. use meson.project_build_root() or meson.global_build_root() instead. ``` Reviewed-by: Dylan Baker Part-of: --- src/intel/shaders/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/shaders/meson.build b/src/intel/shaders/meson.build index a5f15d08f3e..b5db9779a90 100644 --- a/src/intel/shaders/meson.build +++ b/src/intel/shaders/meson.build @@ -60,10 +60,10 @@ foreach gen : intel_shaders_gens '-cl-std=cl2.0', '-D__OPENCL_VERSION__=200', '-DGFX_VERx10=@0@'.format(gen[0]), '-I' + join_paths(meson.current_source_dir(), '.'), - '-I' + join_paths(meson.source_root(), 'src'), - '-I' + join_paths(meson.source_root(), 'src/intel'), - '-I' + join_paths(meson.build_root(), 'src/intel'), - '-I' + join_paths(meson.source_root(), 'src/intel/genxml'), + '-I' + join_paths(dir_source_root, 'src'), + '-I' + join_paths(dir_source_root, 'src/intel'), + '-I' + join_paths(meson.project_build_root(), 'src/intel'), + '-I' + join_paths(dir_source_root, 'src/intel/genxml'), '-include', 'opencl-c.h', ], env: ['MESA_SHADER_CACHE_DISABLE=true'],