Mesa (master): autotools: include intel_tiled_memcopy.c

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c4de8ba036b9f0877077dc72eaf801a830f6341d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4de8ba036b9f0877077dc72eaf801a830f6341d

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue Oct 23 11:01:12 2018 -0700

autotools: include intel_tiled_memcopy.c

There are two problems with the fixed patch. First, it fails to create a
dependency on the sourced .c file, so changes to intel_tiled_memcpy.c
won't trigger a rebuild. It also doesn't get included in the dist
tarball.

Fixes: 11b1afdc92db98e93f2ca50beeb7fc481a11e708
       ("i965/tiled_memcpy: inline movntdqa loads in tiled_to_linear")
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Juan A. Suarez <jasuarez at igalia.com>

---

 src/mesa/drivers/dri/i965/Makefile.am      | 4 ++++
 src/mesa/drivers/dri/i965/Makefile.sources | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index dc19da2c4a..fda17589cf 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -126,6 +126,7 @@ CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = \
 	brw_oa.py \
 	$(i965_oa_xml_FILES) \
+	$(intel_tiled_memcpy_dep_FILES) \
 	meson.build
 
 brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
@@ -135,3 +136,6 @@ brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
 	$(i965_oa_xml_FILES:%=$(srcdir)/%)
 
 brw_oa_metrics.h: brw_oa_metrics.c
+
+intel_tiled_memcpy_normal.c: $(intel_tiled_memcpy_dep_FILES)
+intel_tiled_memcpy_sse41.c: $(intel_tiled_memcpy_dep_FILES)
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 0ab0e42fb1..043a70029f 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -121,6 +121,9 @@ intel_tiled_memcpy_sse41_FILES = \
 	intel_tiled_memcpy_sse41.c \
 	intel_tiled_memcpy_sse41.h
 
+intel_tiled_memcpy_dep_FILES = \
+	intel_tiled_memcpy.c
+
 i965_gen4_FILES = \
 	genX_blorp_exec.c \
 	genX_state_upload.c