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@intel.com>
Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index dc19da2c4a6e973aeef0891f1f8ea84044af9295..fda17589cfb26289cc525c1dc9ff12de6fe89f53 100644 (file)
--- 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 0ab0e42fb18bf83846c640873134feafaf115266..043a70029f24221d23d2606d0cc053d0b189c658 100644 (file)
--- 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