i965: Allow creating planar YUV __DRIimages

[mesa.git] / src / mesa / drivers / dri / i965 / Makefile.am

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 3c8197226fe5d527685036fc3dfc3d69fccd9f23..9a990d21f8ddc9f5314050262b52933c304b4569 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -33,7 +33,9 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
        -I$(top_srcdir)/src/gtest/include \
-       -I$(top_builddir)/src/glsl/nir \
+       -I$(top_srcdir)/src/compiler/nir \
+       -I$(top_srcdir)/src/intel \
+       -I$(top_builddir)/src/compiler/nir \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS) \
@@ -41,35 +43,41 @@ AM_CFLAGS = \
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
+brw_nir_trig_workarounds.c: brw_nir_trig_workarounds.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
+       $(MKDIR_GEN)
+       $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_nir_trig_workarounds.py > $@ || ($(RM) $@; false)
+
 noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la
 libi965_dri_la_SOURCES = $(i965_FILES)
-libi965_dri_la_LIBADD = $(INTEL_LIBS)
+libi965_dri_la_LIBADD = \
+       $(top_builddir)/src/intel/isl/libisl.la \
+       libi965_compiler.la \
+       $(INTEL_LIBS)
+
+libi965_compiler_la_SOURCES = \
+       $(i965_compiler_FILES) \
+       $(i965_compiler_GENERATED_FILES)
+
+BUILT_SOURCES = $(i965_compiler_GENERATED_FILES)
+CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = \
+       brw_nir_trig_workarounds.py
 
 TEST_LIBS = \
-       libi965_dri.la \
-       ../common/libdricommon.la \
-       ../common/libxmlconfig.la \
-       ../common/libmegadriver_stub.la \
+       libi965_compiler.la \
         ../../../libmesa.la \
-       $(DRI_LIB_DEPS) \
-        $(CLOCK_LIB) \
+       $(top_builddir)/src/intel/isl/libisl.la \
+       $(PTHREAD_LIBS) \
+       $(DLOPEN_LIBS) \
        ../common/libdri_test_stubs.la
 
-libi965_compiler_la_SOURCES = $(i965_FILES)
-libi965_compiler_la_LIBADD = $(INTEL_LIBS) \
-       ../common/libdricommon.la \
-       ../common/libxmlconfig.la \
-       ../common/libmegadriver_stub.la \
-        ../../../libmesa.la \
-       $(DRI_LIB_DEPS) \
-        $(CLOCK_LIB) \
-       ../common/libdri_test_stubs.la -lm
-
 TESTS = \
        test_fs_cmod_propagation \
        test_fs_saturate_propagation \
         test_eu_compact \
        test_vf_float_conversions \
+       test_vec4_cmod_propagation \
         test_vec4_copy_propagation \
         test_vec4_register_coalesce
 
@@ -105,6 +113,12 @@ test_vec4_copy_propagation_LDADD = \
         $(top_builddir)/src/gtest/libgtest.la \
         $(TEST_LIBS)
 
+test_vec4_cmod_propagation_SOURCES = \
+       test_vec4_cmod_propagation.cpp
+test_vec4_cmod_propagation_LDADD = \
+       $(top_builddir)/src/gtest/libgtest.la \
+       $(TEST_LIBS)
+
 test_eu_compact_SOURCES = \
        test_eu_compact.c
 nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp