nir/print: Factor variable name lookup into a helper

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

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 32653911f6c07e7003698bad77506f2201eeb77c..8b0a73b250a768aa48bf40c622e85643a27efb18 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
@@ -148,9 +148,6 @@ libglsl_la_SOURCES =                                        \
 
 
 libnir_la_SOURCES =                                    \
-       glsl_types.cpp                                  \
-       builtin_types.cpp                               \
-       glsl_symbol_table.cpp                           \
        $(NIR_FILES)                                    \
        $(NIR_GENERATED_FILES)
 
@@ -158,6 +155,17 @@ glsl_compiler_SOURCES = \
        $(GLSL_COMPILER_CXX_FILES)
 
 glsl_compiler_LDADD =                                  \
+       libglsl.la                                      \
+       $(top_builddir)/src/libglsl_util.la             \
+       $(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)
@@ -274,6 +282,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)