From 9eede9ba0b8cb711fac42e9045bc525d28cfa6df Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Mon, 1 Apr 2024 09:06:09 +0200 Subject: [PATCH] etnaviv: Move hw header to common place I am planning to make use of these headers outside of the gallium driver. Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: --- src/{gallium/drivers => }/etnaviv/hw/.gitignore | 0 src/{gallium/drivers => }/etnaviv/hw/cmdstream.xml.h | 0 src/{gallium/drivers => }/etnaviv/hw/common.xml.h | 0 src/{gallium/drivers => }/etnaviv/hw/common_3d.xml.h | 0 src/{gallium/drivers => }/etnaviv/hw/state.xml.h | 0 src/{gallium/drivers => }/etnaviv/hw/state_3d.xml.h | 0 src/{gallium/drivers => }/etnaviv/hw/state_blt.xml.h | 0 src/{gallium/drivers => }/etnaviv/hw/texdesc_3d.xml.h | 0 src/gallium/drivers/etnaviv/meson.build | 7 ------- src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c | 2 +- 10 files changed, 1 insertion(+), 8 deletions(-) rename src/{gallium/drivers => }/etnaviv/hw/.gitignore (100%) rename src/{gallium/drivers => }/etnaviv/hw/cmdstream.xml.h (100%) rename src/{gallium/drivers => }/etnaviv/hw/common.xml.h (100%) rename src/{gallium/drivers => }/etnaviv/hw/common_3d.xml.h (100%) rename src/{gallium/drivers => }/etnaviv/hw/state.xml.h (100%) rename src/{gallium/drivers => }/etnaviv/hw/state_3d.xml.h (100%) rename src/{gallium/drivers => }/etnaviv/hw/state_blt.xml.h (100%) rename src/{gallium/drivers => }/etnaviv/hw/texdesc_3d.xml.h (100%) diff --git a/src/gallium/drivers/etnaviv/hw/.gitignore b/src/etnaviv/hw/.gitignore similarity index 100% rename from src/gallium/drivers/etnaviv/hw/.gitignore rename to src/etnaviv/hw/.gitignore diff --git a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h b/src/etnaviv/hw/cmdstream.xml.h similarity index 100% rename from src/gallium/drivers/etnaviv/hw/cmdstream.xml.h rename to src/etnaviv/hw/cmdstream.xml.h diff --git a/src/gallium/drivers/etnaviv/hw/common.xml.h b/src/etnaviv/hw/common.xml.h similarity index 100% rename from src/gallium/drivers/etnaviv/hw/common.xml.h rename to src/etnaviv/hw/common.xml.h diff --git a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h b/src/etnaviv/hw/common_3d.xml.h similarity index 100% rename from src/gallium/drivers/etnaviv/hw/common_3d.xml.h rename to src/etnaviv/hw/common_3d.xml.h diff --git a/src/gallium/drivers/etnaviv/hw/state.xml.h b/src/etnaviv/hw/state.xml.h similarity index 100% rename from src/gallium/drivers/etnaviv/hw/state.xml.h rename to src/etnaviv/hw/state.xml.h diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/etnaviv/hw/state_3d.xml.h similarity index 100% rename from src/gallium/drivers/etnaviv/hw/state_3d.xml.h rename to src/etnaviv/hw/state_3d.xml.h diff --git a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h b/src/etnaviv/hw/state_blt.xml.h similarity index 100% rename from src/gallium/drivers/etnaviv/hw/state_blt.xml.h rename to src/etnaviv/hw/state_blt.xml.h diff --git a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h b/src/etnaviv/hw/texdesc_3d.xml.h similarity index 100% rename from src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h rename to src/etnaviv/hw/texdesc_3d.xml.h diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build index f18f4ec874f..659cd391d5c 100644 --- a/src/gallium/drivers/etnaviv/meson.build +++ b/src/gallium/drivers/etnaviv/meson.build @@ -19,13 +19,6 @@ # SOFTWARE. files_etnaviv = files( - 'hw/cmdstream.xml.h', - 'hw/common.xml.h', - 'hw/common_3d.xml.h', - 'hw/state_3d.xml.h', - 'hw/state_blt.xml.h', - 'hw/state.xml.h', - 'hw/texdesc_3d.xml.h', 'etnaviv_asm.c', 'etnaviv_asm.h', 'etnaviv_blend.c', diff --git a/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c b/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c index 035c63bac93..6059b2310bc 100644 --- a/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c +++ b/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c @@ -29,7 +29,7 @@ #include "util/u_screen.h" #include "etnaviv/etnaviv_screen.h" -#include "etnaviv/hw/common.xml.h" +#include "hw/common.xml.h" #include "etnaviv_drm_public.h" #include