diff options
| author | Alejandro Piñeiro <[email protected]> | 2019-11-29 11:17:18 +0100 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-06-27 00:06:58 +0000 |
| commit | 583d7d3d8d0d14d636340b0f12f72db7b0148ceb (patch) | |
| tree | 23fb52b729ab39bf31160a673bb409c7c51325f0 /src/broadcom/drm-shim | |
| parent | 4fccbd0ea60280fd1e9cb0728ba828783fb20b2c (diff) | |
v3d: moving v3d simulator to src/broadcom
So it could be used by both the OpenGL and the Vulkan driver.
In addition to the move, some small changes were needed to be made on
the API. For example, the simulator was receiving v3d_screen on
initialization, and that code setted v3d_screen->sim_file. Now it
returns the new sim_file created.
Reviewed-by: Eric Anholt <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5666>
Diffstat (limited to 'src/broadcom/drm-shim')
| -rw-r--r-- | src/broadcom/drm-shim/meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build index ab474b648ee..cbad07067c1 100644 --- a/src/broadcom/drm-shim/meson.build +++ b/src/broadcom/drm-shim/meson.build @@ -41,7 +41,7 @@ if dep_v3dv3.found() 'v3dx.c', v3d_xml_pack ], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d, inc_simulator], c_args : [no_override_init_args, '-DV3D_VERSION=' + ver, v3dv3_c_args], gnu_symbol_visibility : 'hidden', dependencies: [dep_valgrind, dep_thread, dep_v3dv3], @@ -52,11 +52,11 @@ if dep_v3dv3.found() ['v3d_drm_shim'], [ 'v3d.c', - '../../gallium/drivers/v3d/v3d_simulator_wrapper.cpp', + '../simulator/v3d_simulator_wrapper.cpp', ], dependencies: [idep_mesautil, dep_dl, dep_drm_shim, dep_v3dv3], link_with: per_version_libs, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d, inc_simulator], c_args : [no_override_init_args, '-std=gnu99', v3dv3_c_args], gnu_symbol_visibility : 'hidden', cpp_args : [v3dv3_c_args] |