i965/vec4: remove the generator hack for dual instanced GS

[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 5bb62c49efde837a9499dcc5a056d659cb49e8e2..d6bafed3000dbd5b03538710d8a3e5d2d9245c04 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -23,62 +23,132 @@
 
 include Makefile.sources
 
-if HAVE_I965_DRI
-
-# Hack to make some of the non-automake variables work.
-TOP=$(top_builddir)
-
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/ \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
-       -I$(top_srcdir)/src/mesa/drivers/dri/intel \
        -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
+       -I$(top_srcdir)/src/gtest/include \
+       -I$(top_srcdir)/src/compiler/nir \
+       -I$(top_srcdir)/src/intel \
+       -I$(top_builddir)/src/compiler/nir \
+       -I$(top_builddir)/src/intel \
+       -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
+       $(VISIBILITY_CFLAGS) \
        $(INTEL_CFLAGS)
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-dridir = $(DRI_DRIVER_INSTALL_DIR)
+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)
+
+I965_PERGEN_LIBS = \
+       libi965_gen6.la \
+       libi965_gen7.la \
+       libi965_gen75.la \
+       libi965_gen8.la \
+       libi965_gen9.la
+
+libi965_gen6_la_SOURCES = $(i965_gen6_FILES)
+libi965_gen6_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=60
+
+libi965_gen7_la_SOURCES = $(i965_gen7_FILES)
+libi965_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70
+
+libi965_gen75_la_SOURCES = $(i965_gen75_FILES)
+libi965_gen75_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=75
 
-noinst_LTLIBRARIES = libi965_dri.la
-dri_LTLIBRARIES = i965_dri.la
+libi965_gen8_la_SOURCES = $(i965_gen8_FILES)
+libi965_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80
 
-libi965_dri_la_SOURCES = \
-       $(i965_C_FILES) \
-       $(i965_CXX_FILES)
+libi965_gen9_la_SOURCES = $(i965_gen9_FILES)
+libi965_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
 
-# list of libs to be linked against by i965_dri.so and i965 test programs.
-COMMON_LIBS = \
+noinst_LTLIBRARIES = \
        libi965_dri.la \
-       $(DRI_LIB_DEPS) \
-       $(INTEL_LIBS) \
-       ../common/libdricommon.la
+       libi965_compiler.la \
+       $(I965_PERGEN_LIBS)
 
-TEST_LIBS = \
-       $(COMMON_LIBS) \
-        -lrt \
-       ../common/libdri_test_stubs.la
+libi965_dri_la_SOURCES = $(i965_FILES)
+libi965_dri_la_LIBADD = \
+       $(top_builddir)/src/intel/isl/libisl.la \
+       libi965_compiler.la \
+       $(I965_PERGEN_LIBS) \
+       $(INTEL_LIBS)
+
+libi965_compiler_la_SOURCES = \
+       $(i965_compiler_FILES) \
+       $(i965_compiler_GENERATED_FILES)
+
+BUILT_SOURCES = $(i965_compiler_GENERATED_FILES)
+CLEANFILES = $(BUILT_SOURCES)
 
-i965_dri_la_SOURCES =
-i965_dri_la_LIBADD = $(COMMON_LIBS)
-i965_dri_la_LDFLAGS = -module -avoid-version -shared
+EXTRA_DIST = \
+       brw_nir_trig_workarounds.py
 
-TESTS = test_eu_compact
-check_PROGRAMS = test_eu_compact
+TEST_LIBS = \
+       libi965_compiler.la \
+       $(I965_PERGEN_LIBS) \
+       $(top_builddir)/src/compiler/nir/libnir.la \
+       $(top_builddir)/src/util/libmesautil.la \
+       $(top_builddir)/src/intel/isl/libisl.la \
+       $(PTHREAD_LIBS) \
+       $(DLOPEN_LIBS)
+
+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
+
+check_PROGRAMS = $(TESTS)
+
+test_fs_cmod_propagation_SOURCES = \
+       test_fs_cmod_propagation.cpp
+test_fs_cmod_propagation_LDADD = \
+       $(top_builddir)/src/gtest/libgtest.la \
+       $(TEST_LIBS)
+
+test_fs_saturate_propagation_SOURCES = \
+       test_fs_saturate_propagation.cpp
+test_fs_saturate_propagation_LDADD = \
+       $(top_builddir)/src/gtest/libgtest.la \
+       $(TEST_LIBS)
+
+test_vf_float_conversions_SOURCES = \
+       test_vf_float_conversions.cpp
+test_vf_float_conversions_LDADD = \
+       $(top_builddir)/src/gtest/libgtest.la \
+       $(TEST_LIBS)
+
+test_vec4_register_coalesce_SOURCES = \
+       test_vec4_register_coalesce.cpp
+test_vec4_register_coalesce_LDADD = \
+        $(top_builddir)/src/gtest/libgtest.la \
+        $(TEST_LIBS)
+
+test_vec4_copy_propagation_SOURCES = \
+       test_vec4_copy_propagation.cpp
+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
 test_eu_compact_LDADD = $(TEST_LIBS)
-
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: i965_dri.la
-       $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-       ln -f .libs/i965_dri.so $(top_builddir)/$(LIB_DIR)/i965_dri.so;
-
-endif