nir: Combine the int and double [un]pack opcodes

[mesa.git] / src / compiler / Makefile.nir.am

diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am
index 45a9c809bf883c232cfa50ea41acacd0c75619ce..f4dd8eac9d10ef4e8a47143a869963ad13d48b9f 100644 (file)
--- a/src/compiler/Makefile.nir.am
+++ b/src/compiler/Makefile.nir.am
@@ -23,11 +23,6 @@
 
 noinst_LTLIBRARIES += nir/libnir.la
 
-nir_libnir_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_builddir)/src/compiler/nir \
-       -I$(top_srcdir)/src/compiler/nir
-
 nir_libnir_la_LIBADD = \
        libcompiler.la
 
@@ -36,8 +31,6 @@ nir_libnir_la_SOURCES =                                       \
        $(SPIRV_FILES)                                  \
        $(NIR_GENERATED_FILES)
 
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
-
 nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
@@ -58,6 +51,24 @@ nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
 
+noinst_PROGRAMS += spirv2nir
+
+spirv2nir_SOURCES = \
+       spirv/spirv2nir.c
+
+spirv2nir_CPPFLAGS =                                   \
+       $(AM_CPPFLAGS)                                  \
+       -I$(top_builddir)/src/compiler/nir              \
+       -I$(top_srcdir)/src/compiler/nir                \
+       -I$(top_srcdir)/src/compiler/spirv
+
+spirv2nir_LDADD =                                      \
+       nir/libnir.la                                   \
+       $(top_builddir)/src/util/libmesautil.la         \
+       -lm                                             \
+       $(PTHREAD_LIBS)
+
+nodist_EXTRA_spirv2nir_SOURCES = dummy.cpp
 
 check_PROGRAMS += nir/tests/control_flow_tests
 
@@ -91,4 +102,5 @@ EXTRA_DIST += \
        nir/nir_opcodes_c.py                            \
        nir/nir_opcodes_h.py                            \
        nir/nir_opt_algebraic.py                        \
-       nir/tests
+       nir/tests \
+       SConscript.nir