From 3fcec4a5505a51e90b07be8c392189fa7799d368 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 28 Dec 2018 15:20:13 +0100 Subject: [PATCH] freedreno: Move register constant files to src/freedreno. This way they can be shared. Build tested with meson, but not too sure on the autotools stuff though. Reviewed-by: Dylan Baker Acked-by: Rob Clark --- src/freedreno/Makefile.am | 2 +- src/freedreno/Makefile.sources | 8 ++++++++ src/freedreno/meson.build | 2 +- .../freedreno/a2xx => freedreno/registers}/a2xx.xml.h | 0 .../freedreno/a3xx => freedreno/registers}/a3xx.xml.h | 0 .../freedreno/a4xx => freedreno/registers}/a4xx.xml.h | 0 .../freedreno/a5xx => freedreno/registers}/a5xx.xml.h | 0 .../freedreno/a6xx => freedreno/registers}/a6xx.xml.h | 0 .../freedreno => freedreno/registers}/adreno_common.xml.h | 0 .../freedreno => freedreno/registers}/adreno_pm4.xml.h | 0 src/gallium/drivers/freedreno/Makefile.am | 1 + src/gallium/drivers/freedreno/Makefile.sources | 7 ------- src/gallium/drivers/freedreno/meson.build | 7 ------- src/gallium/winsys/freedreno/drm/Makefile.am | 1 + 14 files changed, 12 insertions(+), 16 deletions(-) rename src/{gallium/drivers/freedreno/a2xx => freedreno/registers}/a2xx.xml.h (100%) rename src/{gallium/drivers/freedreno/a3xx => freedreno/registers}/a3xx.xml.h (100%) rename src/{gallium/drivers/freedreno/a4xx => freedreno/registers}/a4xx.xml.h (100%) rename src/{gallium/drivers/freedreno/a5xx => freedreno/registers}/a5xx.xml.h (100%) rename src/{gallium/drivers/freedreno/a6xx => freedreno/registers}/a6xx.xml.h (100%) rename src/{gallium/drivers/freedreno => freedreno/registers}/adreno_common.xml.h (100%) rename src/{gallium/drivers/freedreno => freedreno/registers}/adreno_pm4.xml.h (100%) diff --git a/src/freedreno/Makefile.am b/src/freedreno/Makefile.am index ff104cf1472..71b94986acc 100644 --- a/src/freedreno/Makefile.am +++ b/src/freedreno/Makefile.am @@ -37,7 +37,7 @@ include Makefile.sources lib_LTLIBRARIES = check_LTLIBRARIES = noinst_DATA = -noinst_HEADERS = +noinst_HEADERS = $(registers_FILES) noinst_LTLIBRARIES = noinst_PROGRAMS = check_PROGRAMS = diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources index 71fb7ef783d..7fea9de39ef 100644 --- a/src/freedreno/Makefile.sources +++ b/src/freedreno/Makefile.sources @@ -41,3 +41,11 @@ ir3_SOURCES := \ ir3_GENERATED_FILES := \ ir3/ir3_nir_trig.c +registers_FILES := \ + registers/a2xx.xml.h \ + registers/a3xx.xml.h \ + registers/a4xx.xml.h \ + registers/a5xx.xml.h \ + registers/a6xx.xml.h \ + registers/adreno_common.xml.h \ + registers/adreno_pm4.xml.h diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build index 26ee6213890..a3db4b1622b 100644 --- a/src/freedreno/meson.build +++ b/src/freedreno/meson.build @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -inc_freedreno = include_directories('.') +inc_freedreno = include_directories(['.', './registers']) subdir('drm') subdir('ir3') diff --git a/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h b/src/freedreno/registers/a2xx.xml.h similarity index 100% rename from src/gallium/drivers/freedreno/a2xx/a2xx.xml.h rename to src/freedreno/registers/a2xx.xml.h diff --git a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h b/src/freedreno/registers/a3xx.xml.h similarity index 100% rename from src/gallium/drivers/freedreno/a3xx/a3xx.xml.h rename to src/freedreno/registers/a3xx.xml.h diff --git a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h b/src/freedreno/registers/a4xx.xml.h similarity index 100% rename from src/gallium/drivers/freedreno/a4xx/a4xx.xml.h rename to src/freedreno/registers/a4xx.xml.h diff --git a/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h b/src/freedreno/registers/a5xx.xml.h similarity index 100% rename from src/gallium/drivers/freedreno/a5xx/a5xx.xml.h rename to src/freedreno/registers/a5xx.xml.h diff --git a/src/gallium/drivers/freedreno/a6xx/a6xx.xml.h b/src/freedreno/registers/a6xx.xml.h similarity index 100% rename from src/gallium/drivers/freedreno/a6xx/a6xx.xml.h rename to src/freedreno/registers/a6xx.xml.h diff --git a/src/gallium/drivers/freedreno/adreno_common.xml.h b/src/freedreno/registers/adreno_common.xml.h similarity index 100% rename from src/gallium/drivers/freedreno/adreno_common.xml.h rename to src/freedreno/registers/adreno_common.xml.h diff --git a/src/gallium/drivers/freedreno/adreno_pm4.xml.h b/src/freedreno/registers/adreno_pm4.xml.h similarity index 100% rename from src/gallium/drivers/freedreno/adreno_pm4.xml.h rename to src/freedreno/registers/adreno_pm4.xml.h diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am index 504ad290de5..49af9ab0e28 100644 --- a/src/gallium/drivers/freedreno/Makefile.am +++ b/src/gallium/drivers/freedreno/Makefile.am @@ -5,6 +5,7 @@ AM_CFLAGS = \ -Wno-packed-bitfield-compat \ -I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \ -I$(top_srcdir)/src/freedreno \ + -I$(top_srcdir)/src/freedreno/registers \ -I$(top_builddir)/src/compiler/nir \ -I$(top_srcdir)/src/compiler/nir \ $(LIBDRM_CFLAGS) \ diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources index 32574a37b83..7bb033ab875 100644 --- a/src/gallium/drivers/freedreno/Makefile.sources +++ b/src/gallium/drivers/freedreno/Makefile.sources @@ -1,6 +1,4 @@ C_SOURCES := \ - adreno_common.xml.h \ - adreno_pm4.xml.h \ disasm.h \ freedreno_batch.c \ freedreno_batch.h \ @@ -41,7 +39,6 @@ C_SOURCES := \ freedreno_util.h a2xx_SOURCES := \ - a2xx/a2xx.xml.h \ a2xx/disasm-a2xx.c \ a2xx/fd2_blend.c \ a2xx/fd2_blend.h \ @@ -74,7 +71,6 @@ a2xx_SOURCES := \ a2xx/ir-a2xx.h a3xx_SOURCES := \ - a3xx/a3xx.xml.h \ a3xx/fd3_blend.c \ a3xx/fd3_blend.h \ a3xx/fd3_context.c \ @@ -101,7 +97,6 @@ a3xx_SOURCES := \ a3xx/fd3_zsa.h a4xx_SOURCES := \ - a4xx/a4xx.xml.h \ a4xx/fd4_blend.c \ a4xx/fd4_blend.h \ a4xx/fd4_context.c \ @@ -128,7 +123,6 @@ a4xx_SOURCES := \ a4xx/fd4_zsa.h a5xx_SOURCES := \ - a5xx/a5xx.xml.h \ a5xx/fd5_blend.c \ a5xx/fd5_blend.h \ a5xx/fd5_blitter.c \ @@ -164,7 +158,6 @@ a5xx_SOURCES := \ a5xx/fd5_zsa.h a6xx_SOURCES := \ - a6xx/a6xx.xml.h \ a6xx/fd6_blend.c \ a6xx/fd6_blend.h \ a6xx/fd6_blitter.c \ diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index df3c743d41d..7afdf5a746f 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -19,8 +19,6 @@ # SOFTWARE. files_libfreedreno = files( - 'adreno_common.xml.h', - 'adreno_pm4.xml.h', 'disasm.h', 'freedreno_batch.c', 'freedreno_batch.h', @@ -59,7 +57,6 @@ files_libfreedreno = files( 'freedreno_texture.h', 'freedreno_util.c', 'freedreno_util.h', - 'a2xx/a2xx.xml.h', 'a2xx/disasm-a2xx.c', 'a2xx/fd2_blend.c', 'a2xx/fd2_blend.h', @@ -90,7 +87,6 @@ files_libfreedreno = files( 'a2xx/instr-a2xx.h', 'a2xx/ir-a2xx.c', 'a2xx/ir-a2xx.h', - 'a3xx/a3xx.xml.h', 'a3xx/fd3_blend.c', 'a3xx/fd3_blend.h', 'a3xx/fd3_context.c', @@ -115,7 +111,6 @@ files_libfreedreno = files( 'a3xx/fd3_texture.h', 'a3xx/fd3_zsa.c', 'a3xx/fd3_zsa.h', - 'a4xx/a4xx.xml.h', 'a4xx/fd4_blend.c', 'a4xx/fd4_blend.h', 'a4xx/fd4_context.c', @@ -140,7 +135,6 @@ files_libfreedreno = files( 'a4xx/fd4_texture.h', 'a4xx/fd4_zsa.c', 'a4xx/fd4_zsa.h', - 'a5xx/a5xx.xml.h', 'a5xx/fd5_blend.c', 'a5xx/fd5_blend.h', 'a5xx/fd5_blitter.c', @@ -174,7 +168,6 @@ files_libfreedreno = files( 'a5xx/fd5_texture.h', 'a5xx/fd5_zsa.c', 'a5xx/fd5_zsa.h', - 'a6xx/a6xx.xml.h', 'a6xx/fd6_blend.c', 'a6xx/fd6_blend.h', 'a6xx/fd6_blitter.c', diff --git a/src/gallium/winsys/freedreno/drm/Makefile.am b/src/gallium/winsys/freedreno/drm/Makefile.am index 76c9bea0d80..16184dfd935 100644 --- a/src/gallium/winsys/freedreno/drm/Makefile.am +++ b/src/gallium/winsys/freedreno/drm/Makefile.am @@ -26,6 +26,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/src/freedreno \ + -I$(top_srcdir)/src/freedreno/registers \ $(GALLIUM_WINSYS_CFLAGS) \ $(FREEDRENO_CFLAGS) -- 2.30.2