From e55de285cc1e6a8a722cd78c821304e4fa51759d Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Mon, 6 Jan 2025 14:55:58 +0100 Subject: [PATCH] panfrost: Kill panfrost-job.h It's empty now, so we don't need to include it from the packer headers. Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/compiler/meson.build | 4 ++-- src/panfrost/include/panfrost-job.h | 35 ----------------------------- src/panfrost/lib/genxml/gen_pack.py | 1 - src/panfrost/lib/meson.build | 12 +++++----- src/panfrost/meson.build | 7 +----- src/panfrost/midgard/meson.build | 12 ++-------- src/panfrost/perf/meson.build | 7 +----- src/panfrost/util/meson.build | 2 +- 8 files changed, 12 insertions(+), 68 deletions(-) delete mode 100644 src/panfrost/include/panfrost-job.h diff --git a/src/panfrost/compiler/meson.build b/src/panfrost/compiler/meson.build index af6208453b1..c5140c0f015 100644 --- a/src/panfrost/compiler/meson.build +++ b/src/panfrost/compiler/meson.build @@ -119,7 +119,7 @@ bifrost_nir_algebraic_c = custom_target( libpanfrost_bifrost_disasm = static_library( 'panfrost_bifrost_disasm', ['bifrost/disassemble.c', 'bi_print_common.c', bifrost_gen_disasm_c], - include_directories : [inc_include, inc_src, inc_panfrost_hw], + include_directories : [inc_include, inc_src], dependencies: [idep_nir], link_with: [libpanfrost_util], c_args : [no_override_init_args], @@ -130,7 +130,7 @@ libpanfrost_bifrost_disasm = static_library( libpanfrost_bifrost = static_library( 'panfrost_bifrost', [libpanfrost_bifrost_files, bi_opcodes_c, bi_printer_c, bi_packer_c, bifrost_nir_algebraic_c, valhall_c], - include_directories : [inc_include, inc_src, inc_panfrost_hw, inc_valhall], + include_directories : [inc_include, inc_src, inc_valhall], dependencies: [idep_nir, idep_bi_opcodes_h, idep_bi_builder_h, idep_valhall_enums_h], link_with: [libpanfrost_util, libpanfrost_bifrost_disasm, libpanfrost_valhall_disasm], c_args : [no_override_init_args], diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h deleted file mode 100644 index 7e06879599d..00000000000 --- a/src/panfrost/include/panfrost-job.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * © Copyright 2017-2018 Alyssa Rosenzweig - * © Copyright 2017-2018 Connor Abbott - * © Copyright 2017-2018 Lyude Paul - * © Copyright2019 Collabora, Ltd. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - */ - -#ifndef __PANFROST_JOB_H__ -#define __PANFROST_JOB_H__ - -#include -#include -#include - -#endif /* __PANFROST_JOB_H__ */ diff --git a/src/panfrost/lib/genxml/gen_pack.py b/src/panfrost/lib/genxml/gen_pack.py index e14f3035a72..2e005113dba 100644 --- a/src/panfrost/lib/genxml/gen_pack.py +++ b/src/panfrost/lib/genxml/gen_pack.py @@ -744,7 +744,6 @@ class Parser(object): self.aggregate = None elif name == "panxml": # Include at the end so it can depend on us but not the converse - print('#include "panfrost-job.h"') print('#endif') def emit_header(self, name): diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index 5bfd8cfc530..499c1adaad9 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -14,9 +14,7 @@ foreach ver : pixel_format_versions libpanfrost_pixel_format += static_library( 'pan-format-v' + ver, ['pan_format.c', pan_packers], - include_directories : [ - inc_src, inc_include, inc_panfrost_hw, inc_panfrost_hw - ], + include_directories : [inc_src, inc_include], c_args : ['-DPAN_ARCH=' + ver], gnu_symbol_visibility : 'hidden', dependencies : [deps_for_libpanfrost, dep_valgrind], @@ -34,7 +32,7 @@ foreach ver : ['4', '5', '6', '7', '9', '10'] 'pan_shader.c', 'pan_texture.c', ], - include_directories : [inc_include, inc_src, inc_panfrost_hw], + include_directories : [inc_include, inc_src], c_args : ['-DPAN_ARCH=' + ver], gnu_symbol_visibility : 'hidden', dependencies : [deps_for_libpanfrost, idep_nir], @@ -45,7 +43,7 @@ foreach ver : ['7'] libpanfrost_per_arch += static_library( 'pan-arch-indirect-v' + ver, 'pan_indirect_dispatch.c', - include_directories : [inc_include, inc_src, inc_panfrost_hw], + include_directories : [inc_include, inc_src], c_args : ['-DPAN_ARCH=' + ver], gnu_symbol_visibility : 'hidden', dependencies : [deps_for_libpanfrost, idep_nir], @@ -72,7 +70,7 @@ libpanfrost_lib_files = files( libpanfrost_lib = static_library( 'panfrost_lib', [libpanfrost_lib_files, pan_packers], - include_directories : [inc_include, inc_src, inc_panfrost_hw], + include_directories : [inc_include, inc_src], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', dependencies: [dep_libdrm, idep_nir, idep_mesautil], @@ -82,7 +80,7 @@ libpanfrost_lib = static_library( libpanfrost_dep = declare_dependency( link_with: [libpanfrost_lib, libpanfrost_decode, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_pixel_format, libpanfrost_per_arch], - include_directories: [inc_include, inc_src, inc_panfrost_hw, inc_panfrost], + include_directories: [inc_include, inc_src, inc_panfrost], dependencies: [deps_for_libpanfrost, libpankmod_dep, idep_nir], ) diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build index 0e0190baa14..9020723820a 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -2,12 +2,8 @@ # Copyright © 2019 Collabora # SPDX-License-Identifier: MIT -inc_panfrost_hw = include_directories([ - 'include' -]) - inc_panfrost = include_directories([ - '.', 'include', 'shared', 'midgard', 'compiler', 'lib' + '.', 'shared', 'midgard', 'compiler', 'lib' ]) compile_args_panfrost = [ @@ -35,7 +31,6 @@ bifrost_compiler = executable( inc_include, inc_src, inc_panfrost, - inc_panfrost_hw, ], dependencies : [ idep_nir, diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build index d060754674a..031b4abe0b5 100644 --- a/src/panfrost/midgard/meson.build +++ b/src/panfrost/midgard/meson.build @@ -41,11 +41,7 @@ midgard_nir_algebraic_c = custom_target( libpanfrost_midgard_disasm = static_library( 'panfrost_midgard_disasm', ['disassemble.c', 'midgard_ops.c', 'midgard_print_constant.c'], - include_directories : [ - inc_include, - inc_src, - inc_panfrost_hw, - ], + include_directories : [inc_include, inc_src], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', build_by_default : false, @@ -54,11 +50,7 @@ libpanfrost_midgard_disasm = static_library( libpanfrost_midgard = static_library( 'panfrost_midgard', [libpanfrost_midgard_files, midgard_nir_algebraic_c], - include_directories : [ - inc_include, - inc_src, - inc_panfrost_hw, - ], + include_directories : [inc_include, inc_src], dependencies: [ idep_nir, idep_mesautil, diff --git a/src/panfrost/perf/meson.build b/src/panfrost/perf/meson.build index 6fa9f8e6c6c..2f8257f1875 100644 --- a/src/panfrost/perf/meson.build +++ b/src/panfrost/perf/meson.build @@ -42,12 +42,7 @@ dep_panfrost_perf = declare_dependency( panfrost_quick = executable( 'panquick', 'quick.c', - include_directories : [ - inc_include, - inc_src, - inc_panfrost, - inc_panfrost_hw, - ], + include_directories : [inc_include, inc_src, inc_panfrost], dependencies : [ dep_libdrm, libpanfrost_dep, diff --git a/src/panfrost/util/meson.build b/src/panfrost/util/meson.build index 849df3f09a6..300206603e5 100644 --- a/src/panfrost/util/meson.build +++ b/src/panfrost/util/meson.build @@ -25,7 +25,7 @@ libpanfrost_util_files = files( libpanfrost_util = static_library( 'panfrost_util', [libpanfrost_util_files], - include_directories : [inc_include, inc_src, inc_panfrost_hw], + include_directories : [inc_include, inc_src], dependencies: [idep_nir, idep_mesautil], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden',