From 5577078ac1ea6b2642d1aa029e030d2e8bbad07e Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Sun, 21 Jul 2024 16:21:50 +0200
Subject: [PATCH] v3d,v3dv: figure out whether we're using the simulator only
 once

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30287>
---
 src/broadcom/simulator/meson.build  | 10 +++++-----
 src/broadcom/vulkan/meson.build     |  6 +-----
 src/gallium/drivers/v3d/meson.build |  6 +-----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/broadcom/simulator/meson.build b/src/broadcom/simulator/meson.build
index 7195d7f836f..17a835d8fdd 100644
--- a/src/broadcom/simulator/meson.build
+++ b/src/broadcom/simulator/meson.build
@@ -11,10 +11,10 @@ files_per_version = files(
     'v3dx_simulator.c',
 )
 
-v3d_args = []
+v3d_simulator_arg = []
 dep_v3d_hw = dependency('v3d_hw', required: false)
 if dep_v3d_hw.found()
-  v3d_args += '-DUSE_V3D_SIMULATOR'
+  v3d_simulator_arg += '-DUSE_V3D_SIMULATOR'
 endif
 
 per_version_libs = []
@@ -25,7 +25,7 @@ foreach ver : v3d_versions
     include_directories : [
       inc_src, inc_include, inc_broadcom,
     ],
-    c_args : [v3d_args, '-DV3D_VERSION=' + ver],
+    c_args : [v3d_simulator_arg, '-DV3D_VERSION=' + ver],
     gnu_symbol_visibility: 'hidden',
     dependencies : [dep_v3d_hw, dep_libdrm, dep_valgrind],
 )
@@ -35,8 +35,8 @@ libbroadcom_simulator = static_library(
   'broadcom_simulator',
   [libbroadcom_simulator_files],
   include_directories : [inc_src, inc_include],
-  c_args : [v3d_args, no_override_init_args],
-  cpp_args : [v3d_args],
+  c_args : [v3d_simulator_arg, no_override_init_args],
+  cpp_args : [v3d_simulator_arg],
   gnu_symbol_visibility : 'hidden', 
   dependencies : [dep_v3d_hw, dep_libdrm, dep_valgrind],
   link_with : [per_version_libs],
diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build
index b895c24743c..5cae2a27a18 100644
--- a/src/broadcom/vulkan/meson.build
+++ b/src/broadcom/vulkan/meson.build
@@ -54,11 +54,7 @@ files_per_version = files(
 
 v3d_versions = ['42', '71']
 
-v3dv_flags = []
-
-if dep_v3d_hw.found()
-  v3dv_flags += '-DUSE_V3D_SIMULATOR'
-endif
+v3dv_flags = [v3d_simulator_arg]
 
 v3dv_deps = [
   dep_dl,
diff --git a/src/gallium/drivers/v3d/meson.build b/src/gallium/drivers/v3d/meson.build
index ff2094f8ab4..8bd0cb179dd 100644
--- a/src/gallium/drivers/v3d/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -35,11 +35,7 @@ files_per_version = files(
   'v3dx_tfu.c',
 )
 
-v3d_args = ['-DV3D_BUILD_NEON']
-
-if dep_v3d_hw.found()
-  v3d_args += '-DUSE_V3D_SIMULATOR'
-endif
+v3d_args = ['-DV3D_BUILD_NEON', v3d_simulator_arg]
 
 v3d_versions = ['42', '71']