nir/spirv: Move CF emit code into vtn_cfg.c

[mesa.git] / src / glsl / Makefile.am

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 437c6a5fbcd47069a02a1eff7abeafd57057d65f..1396758b7c235ba626f862060e9ae7726b35f11f 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -78,7 +78,7 @@ check_PROGRAMS =                                      \
        tests/sampler-types-test                        \
        tests/uniform-initializer-test
 
-noinst_PROGRAMS = glsl_compiler
+noinst_PROGRAMS = glsl_compiler spirv2nir
 
 tests_blob_test_SOURCES =                              \
        tests/blob_test.c
@@ -144,11 +144,13 @@ libglsl_la_SOURCES =                                      \
        glsl_parser.h                                   \
        $(LIBGLSL_FILES)                                \
        $(NIR_FILES)                                    \
+       $(SPIRV_FILES)                                  \
        $(NIR_GENERATED_FILES)
 
 
 libnir_la_SOURCES =                                    \
        $(NIR_FILES)                                    \
+       $(SPIRV_FILES)                                  \
        $(NIR_GENERATED_FILES)
 
 glsl_compiler_SOURCES = \
@@ -160,6 +162,16 @@ glsl_compiler_LDADD =                                      \
        $(top_builddir)/src/util/libmesautil.la         \
        $(PTHREAD_LIBS)
 
+spirv2nir_SOURCES = \
+       standalone_scaffolding.cpp \
+       standalone_scaffolding.h \
+       nir/spirv2nir.c
+
+spirv2nir_LDADD =                                      \
+       libglsl.la                                      \
+       $(top_builddir)/src/libglsl_util.la             \
+       $(PTHREAD_LIBS)
+
 glsl_test_SOURCES = \
        standalone_scaffolding.cpp \
        test.cpp \
@@ -272,6 +284,5 @@ nir_tests_control_flow_tests_CFLAGS =                       \
 nir_tests_control_flow_tests_LDADD =                   \
        $(top_builddir)/src/gtest/libgtest.la           \
        $(top_builddir)/src/glsl/libnir.la              \
-       $(top_builddir)/src/libglsl_util.la             \
        $(top_builddir)/src/util/libmesautil.la         \
        $(PTHREAD_LIBS)