From c96e73aa9355c4254475e3fe2f246a0dd85f92c9 Mon Sep 17 00:00:00 2001 From: hwandy Date: Wed, 13 May 2026 15:36:39 +0800 Subject: [PATCH] Revert "intel/decoder: make libvulkan_intel to depend on stub decoder when buildtyle=release." This reverts commit 2ee6b4d96e02d5bb63276bc5a2f8bfa60423b785. The previous change avoids 0.25MB (1%) size change on the driver binary file, but blocks the runtime enablement for some intel tools which is critical to our optimization tasks. It's not a good tradeoff based on the new need of the tool in runtime, so revert this change. Test: meson setup builddir -Dallow-fallback-for=libdrm -D build-tests=true -Dbuildtype=release --reconfigure && ninja -C builddir && cd builddir && meson test Reviewed-by: Lionel Landwerlin Signed-off-by: hwandy Part-of: --- src/intel/decoder/meson.build | 78 +++++++++++------------------------ src/intel/vulkan/meson.build | 7 +--- 2 files changed, 25 insertions(+), 60 deletions(-) diff --git a/src/intel/decoder/meson.build b/src/intel/decoder/meson.build index fedb69d87ee..0753201155a 100644 --- a/src/intel/decoder/meson.build +++ b/src/intel/decoder/meson.build @@ -1,41 +1,26 @@ # Copyright © 2017 Intel Corporation # SPDX-License-Identifier: MIT -libintel_decoder_common_args = { - 'include_directories' : [inc_include, inc_src, inc_intel], - 'c_args' : [no_override_init_args, sse2_args], - 'gnu_symbol_visibility' : 'hidden', - 'build_by_default' : false, -} - -libintel_decoder_stub_files = files( +libintel_decoder_files = files( 'intel_decoder.h', - 'intel_batch_decoder_stub.c', -) + ) -libintel_decoder_impl_files = files ( - 'intel_decoder.h', - 'intel_decoder.c', - 'intel_batch_decoder.c', -) - -libintel_decoder_stub_deps = [ +libintel_decoder_deps = [ idep_intel_dev ] -libintel_decoder_impl_deps = [ - idep_intel_dev, - dep_expat -] - if not dep_expat.found() - libintel_decoder_deps = libintel_decoder_stub_deps - libintel_decoder_files = libintel_decoder_stub_files + libintel_decoder_files += files( + 'intel_batch_decoder_stub.c', + ) libintel_decoder_brw_files = files() libintel_decoder_elk_files = files() else - libintel_decoder_deps = libintel_decoder_impl_deps - libintel_decoder_files = libintel_decoder_impl_files + libintel_decoder_deps += dep_expat + libintel_decoder_files += files( + 'intel_decoder.c', + 'intel_batch_decoder.c', + ) libintel_decoder_brw_files = files('intel_batch_decoder_brw.c') libintel_decoder_elk_files = files('intel_batch_decoder_elk.c') endif @@ -43,8 +28,11 @@ endif libintel_decoder = static_library( 'intel_decoder', [libintel_decoder_files, genX_xml_h, sha1_h], + include_directories : [inc_include, inc_src, inc_intel], + c_args : [no_override_init_args, sse2_args], + gnu_symbol_visibility : 'hidden', dependencies : libintel_decoder_deps, - kwargs : libintel_decoder_common_args + build_by_default : false, ) idep_intel_decoder = declare_dependency( @@ -55,8 +43,11 @@ idep_intel_decoder = declare_dependency( libintel_decoder_brw = static_library( 'intel_decoder_brw', [libintel_decoder_brw_files, genX_xml_h, sha1_h], + include_directories : [inc_include, inc_src, inc_intel], + c_args : [no_override_init_args, sse2_args], + gnu_symbol_visibility : 'hidden', dependencies : idep_intel_decoder, - kwargs : libintel_decoder_common_args + build_by_default : false, ) idep_intel_decoder_brw = declare_dependency( @@ -68,8 +59,11 @@ if with_intel_elk libintel_decoder_elk = static_library( 'intel_decoder_elk', [libintel_decoder_elk_files, genX_xml_h, sha1_h], + include_directories : [inc_include, inc_src, inc_intel], + c_args : [no_override_init_args, sse2_args], + gnu_symbol_visibility : 'hidden', dependencies : idep_intel_decoder, - kwargs : libintel_decoder_common_args + build_by_default : false, ) idep_intel_decoder_elk = declare_dependency( @@ -80,32 +74,6 @@ else idep_intel_decoder_elk = null_dep endif -# Stub decoder. -libintel_decoder_stub = static_library( - 'intel_decoder_stub', - [libintel_decoder_stub_files, genX_xml_h, sha1_h], - dependencies : libintel_decoder_stub_deps, - kwargs : libintel_decoder_common_args -) - -idep_intel_decoder_stub = declare_dependency( - link_with : [libintel_decoder_stub], - dependencies : libintel_decoder_stub_deps, -) - -libintel_decoder_stub_brw = static_library( - 'intel_decoder_stub_brw', - [genX_xml_h, sha1_h], - dependencies : idep_intel_decoder_stub, - kwargs : libintel_decoder_common_args -) - -idep_intel_decoder_stub_brw = declare_dependency( - link_with : [libintel_decoder_stub_brw], - dependencies : idep_intel_decoder_stub, -) - -# Test. if with_tests and not with_platform_android gentest_xml = 'tests/gentest.xml' _name = 'gentest_pack.h' diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index fca8a1a9493..9d13c7bbda4 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -264,9 +264,6 @@ libanv_common = static_library( dependencies : anv_deps ) -idep_libvulkan_intel_decoder = (with_mesa_ndebug ? - idep_intel_decoder_stub_brw : idep_intel_decoder_brw) - libvulkan_intel = shared_library( 'vulkan_intel', [files('anv_gem.c'), anv_entrypoints[0], bvh_spv], @@ -282,7 +279,7 @@ libvulkan_intel = shared_library( idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, idep_mesautil, idep_xmlconfig, idep_intel_driver_ds, idep_intel_dev, idep_intel_blorp, - idep_intel_compiler_brw, idep_libvulkan_intel_decoder, + idep_intel_compiler_brw, idep_intel_decoder_brw, idep_intel_compiler_jay, ], c_args : anv_flags, @@ -321,7 +318,7 @@ if with_tests dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, idep_mesautil, idep_intel_dev, idep_intel_blorp, - idep_intel_compiler_brw, idep_intel_compiler_jay, idep_libvulkan_intel_decoder, + idep_intel_compiler_brw, idep_intel_compiler_jay, idep_intel_decoder_brw, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden',