From af38b71e5bc44604e7c750b99ea57fdaf6e830ab Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 17 Dec 2025 07:30:17 -0800 Subject: [PATCH] freedreno/a6xx: Set FD_BO_NO_HARDPIN from meson Rather than setting it in each file, we can just set it globally for all c++ files. Signed-off-by: Rob Clark Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_barrier.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_blend.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_compute.cc | 1 - src/gallium/drivers/freedreno/a6xx/fd6_const.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_context.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_draw.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_emit.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_image.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_program.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_query.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_resource.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_screen.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_texture.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc | 2 -- src/gallium/drivers/freedreno/a6xx/fd6_zsa.cc | 2 -- src/gallium/drivers/freedreno/meson.build | 1 + 19 files changed, 1 insertion(+), 35 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_barrier.cc b/src/gallium/drivers/freedreno/a6xx/fd6_barrier.cc index dc478ae0eeb..a3eb2c3cb8a 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_barrier.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_barrier.cc @@ -3,8 +3,6 @@ * SPDX-License-Identifier: MIT */ -#define FD_BO_NO_HARDPIN 1 - #include "freedreno_batch.h" #include "fd6_barrier.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blend.cc b/src/gallium/drivers/freedreno/a6xx/fd6_blend.cc index 769f802baeb..3cde4a02c1b 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blend.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blend.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "util/u_blend.h" #include "util/u_dual_blend.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc index da1e28580fb..5ace6ea1b45 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "util/format_srgb.h" #include "util/half_float.h" #include "util/u_dump.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_compute.cc b/src/gallium/drivers/freedreno/a6xx/fd6_compute.cc index 314db5ef580..e1731555120 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_compute.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_compute.cc @@ -7,7 +7,6 @@ */ #include "drm/freedreno_ringbuffer.h" -#define FD_BO_NO_HARDPIN 1 #include "pipe/p_state.h" #include "util/u_dump.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_const.cc b/src/gallium/drivers/freedreno/a6xx/fd6_const.cc index b2d94a1cf91..b91123a35a5 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_const.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_const.cc @@ -4,8 +4,6 @@ * SPDX-License-Identifier: MIT */ -#define FD_BO_NO_HARDPIN 1 - #include "fd6_barrier.h" #include "fd6_const.h" #include "fd6_compute.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.cc b/src/gallium/drivers/freedreno/a6xx/fd6_context.cc index 0211f5385e2..f47f7438948 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_context.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "freedreno_query_acc.h" #include "freedreno_state.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc b/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc index 00232bad861..64e508acb97 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_draw.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "util/u_memory.h" #include "util/u_prim.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc b/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc index 48d02729550..c1bb053392d 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "util/format/u_format.h" #include "util/u_helpers.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc index b59f0f35370..86dad45ec0d 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include #include "pipe/p_state.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_image.cc b/src/gallium/drivers/freedreno/a6xx/fd6_image.cc index eee9f113d09..12d6b9dbd40 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_image.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_image.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "freedreno_resource.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.cc b/src/gallium/drivers/freedreno/a6xx/fd6_program.cc index 35886125033..711f4277384 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_program.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include #include "pipe/p_state.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_query.cc b/src/gallium/drivers/freedreno/a6xx/fd6_query.cc index 016f2db270f..181a2aa4a26 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_query.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_query.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - /* NOTE: see https://gitlab.freedesktop.org/freedreno/freedreno/-/wikis/A5xx-Queries */ #include "freedreno_query_acc.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.cc b/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.cc index d689d02415d..894d4915481 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_rasterizer.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "util/u_memory.h" #include "util/u_string.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc index bdc0d761ceb..ba83f746978 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "drm-uapi/drm_fourcc.h" #include "a6xx/fd6_blitter.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_screen.cc b/src/gallium/drivers/freedreno/a6xx/fd6_screen.cc index 2d2926b26a4..dc8723529ce 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_screen.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_screen.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "drm-uapi/drm_fourcc.h" #include "pipe/p_screen.h" #include "util/format/u_format.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc index e0172e89a85..393e353ccd1 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "util/format/u_format.h" #include "util/hash_table.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc b/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc index 64ee51a1ae5..17ed3298aed 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc @@ -3,8 +3,6 @@ * SPDX-License-Identifier: MIT */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "freedreno_batch.h" diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_zsa.cc b/src/gallium/drivers/freedreno/a6xx/fd6_zsa.cc index 1ec97d28c22..3ff81678e5c 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_zsa.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_zsa.cc @@ -7,8 +7,6 @@ * Rob Clark */ -#define FD_BO_NO_HARDPIN 1 - #include "pipe/p_state.h" #include "util/u_memory.h" #include "util/u_string.h" diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index 8e4fdc41374..57cda5ffb43 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -235,6 +235,7 @@ freedreno_c_args += cc.get_supported_arguments([ freedreno_cpp_args = [] freedreno_cpp_args += cpp.get_supported_arguments([ + '-DFD_BO_NO_HARDPIN=1', '-fno-exceptions', '-fno-rtti', '-Wno-address-of-packed-member',