OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/blorp: Use a Meson dependency for blorp

Browse Source 
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27643>
This commit is contained in:
Caio Oliveira
2024-01-24 10:21:05 -08:00
committed by Marge Bot
parent f55f9272e4
commit 3b48b7df1f
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/crocus/meson.build
View File

@@ -80,10 +80,10 @@ libcrocus = static_library(
c_args : [sse2_args], c_args : [sse2_args],
cpp_args : [sse2_args], cpp_args : [sse2_args],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers, idep_intel_dev], dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers, idep_intel_dev, idep_intel_blorp],
link_with : [ link_with : [
crocus_per_hw_ver_libs, libintel_compiler, libisl, crocus_per_hw_ver_libs, libintel_compiler, libisl,
libblorp, libintel_perf libintel_perf
], ],
) )

5
src/gallium/drivers/iris/meson.build
View File

@@ -99,10 +99,11 @@ libiris = static_library(
cpp_args : [sse2_args], cpp_args : [sse2_args],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers, dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers,
idep_libintel_common, idep_intel_driver_ds, idep_intel_dev], idep_libintel_common, idep_intel_driver_ds, idep_intel_dev,
idep_intel_blorp],
link_with : [ link_with : [
iris_per_hw_ver_libs, libintel_compiler, libisl, iris_per_hw_ver_libs, libintel_compiler, libisl,
libblorp, libintel_perf libintel_perf
], ],
) )

5
src/intel/blorp/meson.build
View File

@@ -35,4 +35,9 @@ libblorp = static_library(
c_args : [no_override_init_args], c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
dependencies : [idep_nir_headers, idep_genxml, idep_mesautil, idep_intel_dev], dependencies : [idep_nir_headers, idep_genxml, idep_mesautil, idep_intel_dev],
build_by_default: false,
)
idep_intel_blorp = declare_dependency(
link_with: libblorp,
) )

8
src/intel/vulkan/meson.build
View File

@@ -254,13 +254,13 @@ libvulkan_intel = shared_library(
], ],
link_whole : [libanv_common, libanv_per_hw_ver_libs] + optional_libgrl, link_whole : [libanv_common, libanv_per_hw_ver_libs] + optional_libgrl,
link_with : [ link_with : [
libintel_compiler, libisl, libblorp, libintel_perf, libintel_compiler, libisl, libintel_perf,
], ],
dependencies : [ dependencies : [
dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common, dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common,
idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi, idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi,
idep_vulkan_runtime, idep_mesautil, idep_xmlconfig, idep_vulkan_runtime, idep_mesautil, idep_xmlconfig,
idep_intel_driver_ds, idep_intel_dev, idep_intel_driver_ds, idep_intel_dev, idep_intel_blorp,
], ],
c_args : anv_flags, c_args : anv_flags,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
@@ -292,12 +292,12 @@ if with_tests
link_whole : libanv_common, link_whole : libanv_common,
link_with : [ link_with : [
libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libanv_per_hw_ver_libs, libintel_compiler, libintel_common,
libisl, libblorp, libintel_perf, libisl, libintel_perf,
] + optional_libgrl, ] + optional_libgrl,
dependencies : [ dependencies : [
dep_thread, dep_dl, dep_m, anv_deps, dep_thread, dep_dl, dep_m, anv_deps,
idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime,
idep_mesautil, idep_intel_dev, idep_intel_shaders, idep_mesautil, idep_intel_dev, idep_intel_shaders, idep_intel_blorp,
], ],
c_args : anv_flags, c_args : anv_flags,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',

8
src/intel/vulkan_hasvk/meson.build
View File

@@ -189,13 +189,13 @@ libvulkan_intel_hasvk = shared_library(
], ],
link_whole : [libanv_hasvk_common, libanv_per_hw_ver_libs], link_whole : [libanv_hasvk_common, libanv_per_hw_ver_libs],
link_with : [ link_with : [
libintel_compiler, libisl, libblorp, libintel_perf, libintel_compiler, libisl, libintel_perf,
], ],
dependencies : [ dependencies : [
dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common, dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common,
idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi, idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi,
idep_vulkan_runtime, idep_mesautil, idep_xmlconfig, idep_vulkan_runtime, idep_mesautil, idep_xmlconfig,
idep_intel_driver_ds, idep_intel_dev, idep_intel_driver_ds, idep_intel_dev, idep_intel_blorp,
], ],
c_args : anv_flags, c_args : anv_flags,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',
@@ -228,12 +228,12 @@ if with_tests
link_whole : libanv_hasvk_common, link_whole : libanv_hasvk_common,
link_with : [ link_with : [
libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libanv_per_hw_ver_libs, libintel_compiler, libintel_common,
libisl, libblorp, libintel_perf, libisl, libintel_perf,
], ],
dependencies : [ dependencies : [
dep_thread, dep_dl, dep_m, anv_deps, dep_thread, dep_dl, dep_m, anv_deps,
idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime,
idep_mesautil, idep_intel_dev, idep_mesautil, idep_intel_dev, idep_intel_blorp,
], ],
c_args : anv_flags, c_args : anv_flags,
gnu_symbol_visibility : 'hidden', gnu_symbol_visibility : 'hidden',