Module: Mesa Branch: main Commit: be3e4c8aaf1b2b9d257a7abd9c3d7ab43ecfdcc5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be3e4c8aaf1b2b9d257a7abd9c3d7ab43ecfdcc5
Author: Caio Oliveira <[email protected]> Date: Wed Jun 14 23:42:24 2023 -0700 compiler/clc: Rename the internal library from libclc to libmesaclc There is an actual external libclc and we do use it, so rename the internal common library to avoid confusion. Reviewed-by: Jesse Natalie <[email protected]> Acked-by: Nora Allen <[email protected]> Acked-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23667> --- src/compiler/clc/meson.build | 28 ++++++++++++++-------------- src/gallium/frontends/rusticl/meson.build | 2 +- src/intel/compiler/meson.build | 2 +- src/microsoft/clc/meson.build | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build index 80e21b10f2c..ec5176522e4 100644 --- a/src/compiler/clc/meson.build +++ b/src/compiler/clc/meson.build @@ -20,13 +20,13 @@ # IN THE SOFTWARE. -files_libclc = files( +files_libmesaclc = files( 'clc.c', 'clc_helpers.cpp', ) -_libclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] -_libclc_sources = [] +_libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] +_libmesaclc_sources = [] if get_option('opencl-external-clang-headers') \ .disable_auto_if(host_machine.system() == 'windows') \ @@ -57,30 +57,30 @@ if get_option('opencl-external-clang-headers') \ command : [prog_python, '@INPUT@', '@OUTPUT@', '-n', 'opencl_c_base_source'], ) - _libclc_sources += [opencl_c_base_h] + _libmesaclc_sources += [opencl_c_base_h] if dep_llvm.version().version_compare('< 15.0') - _libclc_sources += [opencl_c_h] + _libmesaclc_sources += [opencl_c_h] endif - _libclc_cpp_args += ['-DUSE_STATIC_OPENCL_C_H=1'] + _libmesaclc_cpp_args += ['-DUSE_STATIC_OPENCL_C_H=1'] endif # Supported added for SPIRV 1.4 in a version that required LLVM 14. if dep_llvm.version().version_compare('>= 14.0') - _libclc_cpp_args += ['-DHAS_SPIRV_1_4=1'] + _libmesaclc_cpp_args += ['-DHAS_SPIRV_1_4=1'] endif -_libclc = static_library( - 'libclc', - files_libclc, - sources: _libclc_sources, +_libmesaclc = static_library( + 'libmesaclc', + files_libmesaclc, + sources: _libmesaclc_sources, include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler, inc_spirv], - cpp_args : _libclc_cpp_args, + cpp_args : _libmesaclc_cpp_args, dependencies: [idep_nir_headers, dep_clang, dep_llvm, dep_llvmspirvlib, idep_mesautil, idep_nir, dep_spirv_tools] ) -idep_clc = declare_dependency( - link_with : _libclc, +idep_mesaclc = declare_dependency( + link_with : _libmesaclc, include_directories : include_directories('.'), ) diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build index 9aecb339537..a3bd4180f93 100644 --- a/src/gallium/frontends/rusticl/meson.build +++ b/src/gallium/frontends/rusticl/meson.build @@ -285,7 +285,7 @@ libmesa_rust_gen = static_library( libgallium, ], dependencies: [ - idep_clc, + idep_mesaclc, ], rust_crate_type : 'rlib', rust_args : [ diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index 92d4fa23e93..efde0241f21 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -177,7 +177,7 @@ if with_intel_clc include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], c_args : [pre_args, no_override_init_args], link_args : [ld_args_build_id], - dependencies : [idep_nir, idep_clc, idep_mesautil, idep_intel_dev], + dependencies : [idep_nir, idep_mesaclc, idep_mesautil, idep_intel_dev], native : true, ) endif diff --git a/src/microsoft/clc/meson.build b/src/microsoft/clc/meson.build index 8e6e77e7c73..591c3ee3ad2 100644 --- a/src/microsoft/clc/meson.build +++ b/src/microsoft/clc/meson.build @@ -29,7 +29,7 @@ libclc_compiler = shared_library( [files_libclc_compiler, sha1_h], vs_module_defs : 'clon12compiler.def', include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler, inc_gallium, inc_spirv], - dependencies: [idep_clc, idep_nir_headers, dep_version, idep_mesautil, + dependencies: [idep_mesaclc, idep_nir_headers, dep_version, idep_mesautil, idep_libdxil_compiler, idep_nir], name_prefix : '' # otherwise mingw will create libclon12compiler.dll )
