v3d,v3dv: figure out whether we're using the simulator only once
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30287>
This commit is contained in:

committed by
Marge Bot

parent
f90d1182e0
commit
5577078ac1
@@ -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],
|
||||
|
@@ -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,
|
||||
|
@@ -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']
|
||||
|
||||
|
Reference in New Issue
Block a user