Module: Mesa Branch: main Commit: 2bc815878c7f72b45dbb03f505850bb7d2538dc4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bc815878c7f72b45dbb03f505850bb7d2538dc4
Author: Rob Clark <[email protected]> Date: Wed Feb 2 09:45:57 2022 -0800 freedreno/drm: Split msm backend into subdir Let's keep things a bit better organized when we add a new backend. Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14900> --- src/freedreno/drm/meson.build | 39 +++++++++++++++---------- src/freedreno/drm/{ => msm}/msm_bo.c | 0 src/freedreno/drm/{ => msm}/msm_device.c | 0 src/freedreno/drm/{ => msm}/msm_pipe.c | 0 src/freedreno/drm/{ => msm}/msm_priv.h | 0 src/freedreno/drm/{ => msm}/msm_ringbuffer.c | 0 src/freedreno/drm/{ => msm}/msm_ringbuffer_sp.c | 0 src/freedreno/drm/{ => msm}/msm_ringbuffer_sp.h | 0 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/freedreno/drm/meson.build b/src/freedreno/drm/meson.build index 3cee9d424f6..1284f5fd1d8 100644 --- a/src/freedreno/drm/meson.build +++ b/src/freedreno/drm/meson.build @@ -27,13 +27,28 @@ libfreedreno_drm_files = files( 'freedreno_priv.h', 'freedreno_ringbuffer.c', 'freedreno_ringbuffer.h', - 'msm_bo.c', - 'msm_device.c', - 'msm_pipe.c', - 'msm_priv.h', - 'msm_ringbuffer.c', - 'msm_ringbuffer_sp.c', ) +libfreedreno_drm_flags = [] +libfreedreno_drm_includes = [ + inc_freedreno, + inc_include, + inc_src, + inc_mapi, + inc_mesa, + inc_gallium, + inc_gallium_aux, +] + +libfreedreno_drm_msm_files = files( + 'msm/msm_bo.c', + 'msm/msm_device.c', + 'msm/msm_pipe.c', + 'msm/msm_priv.h', + 'msm/msm_ringbuffer.c', + 'msm/msm_ringbuffer_sp.c', + 'msm/msm_ringbuffer_sp.h', +) +libfreedreno_drm_files += libfreedreno_drm_msm_files libfreedreno_drm = static_library( 'freedreno_drm', @@ -41,16 +56,8 @@ libfreedreno_drm = static_library( libfreedreno_drm_files, freedreno_xml_header_files, ], - include_directories : [ - inc_freedreno, - inc_include, - inc_src, - inc_mapi, - inc_mesa, - inc_gallium, - inc_gallium_aux, - ], - c_args : [no_override_init_args], + include_directories : libfreedreno_drm_includes, + c_args : [no_override_init_args, libfreedreno_drm_flags], gnu_symbol_visibility : 'hidden', dependencies : [ dep_libdrm, diff --git a/src/freedreno/drm/msm_bo.c b/src/freedreno/drm/msm/msm_bo.c similarity index 100% rename from src/freedreno/drm/msm_bo.c rename to src/freedreno/drm/msm/msm_bo.c diff --git a/src/freedreno/drm/msm_device.c b/src/freedreno/drm/msm/msm_device.c similarity index 100% rename from src/freedreno/drm/msm_device.c rename to src/freedreno/drm/msm/msm_device.c diff --git a/src/freedreno/drm/msm_pipe.c b/src/freedreno/drm/msm/msm_pipe.c similarity index 100% rename from src/freedreno/drm/msm_pipe.c rename to src/freedreno/drm/msm/msm_pipe.c diff --git a/src/freedreno/drm/msm_priv.h b/src/freedreno/drm/msm/msm_priv.h similarity index 100% rename from src/freedreno/drm/msm_priv.h rename to src/freedreno/drm/msm/msm_priv.h diff --git a/src/freedreno/drm/msm_ringbuffer.c b/src/freedreno/drm/msm/msm_ringbuffer.c similarity index 100% rename from src/freedreno/drm/msm_ringbuffer.c rename to src/freedreno/drm/msm/msm_ringbuffer.c diff --git a/src/freedreno/drm/msm_ringbuffer_sp.c b/src/freedreno/drm/msm/msm_ringbuffer_sp.c similarity index 100% rename from src/freedreno/drm/msm_ringbuffer_sp.c rename to src/freedreno/drm/msm/msm_ringbuffer_sp.c diff --git a/src/freedreno/drm/msm_ringbuffer_sp.h b/src/freedreno/drm/msm/msm_ringbuffer_sp.h similarity index 100% rename from src/freedreno/drm/msm_ringbuffer_sp.h rename to src/freedreno/drm/msm/msm_ringbuffer_sp.h
