projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
nir: remove dependency on glsl
[mesa.git] / src / glsl / Makefile.am
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 5a0a643daf2ab3905b17fc3536e75535be5f1b16..437c6a5fbcd47069a02a1eff7abeafd57057d65f 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -19,8 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
@@ -33,8 +31,12 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gtest/include \
        -I$(top_builddir)/src/glsl/nir \
        $(DEFINES)
-AM_CFLAGS = $(VISIBILITY_CFLAGS)
-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+AM_CFLAGS = \
+       $(VISIBILITY_CFLAGS) \
+       $(MSVC2013_COMPAT_CFLAGS)
+AM_CXXFLAGS = \
+       $(VISIBILITY_CXXFLAGS) \
+       $(MSVC2013_COMPAT_CXXFLAGS)
 
 EXTRA_DIST = tests glcpp/tests README TODO glcpp/README        \
        glsl_lexer.ll                                   \
@@ -42,17 +44,20 @@ EXTRA_DIST = tests glcpp/tests README TODO glcpp/README     \
        glcpp/glcpp-lex.l                               \
        glcpp/glcpp-parse.y                             \
        nir/nir_algebraic.py                            \
+       nir/nir_builder_opcodes_h.py                    \
        nir/nir_constant_expressions.py                 \
        nir/nir_opcodes.py                              \
        nir/nir_opcodes_c.py                            \
        nir/nir_opcodes_h.py                            \
        nir/nir_opt_algebraic.py                        \
+       nir/tests                                       \
        SConscript
 
 include Makefile.sources
 
 TESTS = glcpp/tests/glcpp-test                         \
        glcpp/tests/glcpp-test-cr-lf                    \
+        nir/tests/control_flow_tests                   \
        tests/blob-test                                 \
        tests/general-ir-test                           \
        tests/optimization-test                         \
@@ -63,10 +68,11 @@ TESTS_ENVIRONMENT= \
        export PYTHON2=$(PYTHON2); \
        export PYTHON_FLAGS=$(PYTHON_FLAGS);
 
-noinst_LTLIBRARIES = libglsl.la libglcpp.la
+noinst_LTLIBRARIES = libnir.la libglsl.la libglcpp.la
 check_PROGRAMS =                                       \
        glcpp/glcpp                                     \
        glsl_test                                       \
+       nir/tests/control_flow_tests                    \
        tests/blob-test                                 \
        tests/general-ir-test                           \
        tests/sampler-types-test                        \
@@ -84,8 +90,7 @@ tests_general_ir_test_SOURCES =               \
        tests/builtin_variable_test.cpp                 \
        tests/invalidate_locations_test.cpp             \
        tests/general_ir_test.cpp                       \
-       tests/varyings_test.cpp                         \
-       tests/common.c
+       tests/varyings_test.cpp
 tests_general_ir_test_CFLAGS =                         \
        $(PTHREAD_CFLAGS)
 tests_general_ir_test_LDADD =                          \
@@ -98,8 +103,7 @@ tests_uniform_initializer_test_SOURCES =             \
        tests/copy_constant_to_storage_tests.cpp        \
        tests/set_uniform_initializer_tests.cpp         \
        tests/uniform_initializer_utils.cpp             \
-       tests/uniform_initializer_utils.h               \
-       tests/common.c
+       tests/uniform_initializer_utils.h
 tests_uniform_initializer_test_CFLAGS =                        \
        $(PTHREAD_CFLAGS)
 tests_uniform_initializer_test_LDADD =                 \
@@ -109,8 +113,7 @@ tests_uniform_initializer_test_LDADD =                      \
        $(PTHREAD_LIBS)
 
 tests_sampler_types_test_SOURCES =                     \
-       tests/sampler_types_test.cpp                    \
-       tests/common.c
+       tests/sampler_types_test.cpp
 tests_sampler_types_test_CFLAGS =                      \
        $(PTHREAD_CFLAGS)
 tests_sampler_types_test_LDADD =                       \
@@ -128,8 +131,7 @@ libglcpp_la_SOURCES =                                       \
        $(LIBGLCPP_FILES)
 
 glcpp_glcpp_SOURCES =                                  \
-       glcpp/glcpp.c                                   \
-       tests/common.c
+       glcpp/glcpp.c
 glcpp_glcpp_LDADD =                                    \
        libglcpp.la                                     \
        $(top_builddir)/src/libglsl_util.la             \
@@ -141,7 +143,13 @@ libglsl_la_SOURCES =                                       \
        glsl_parser.cpp                                 \
        glsl_parser.h                                   \
        $(LIBGLSL_FILES)                                \
-       $(NIR_FILES)
+       $(NIR_FILES)                                    \
+       $(NIR_GENERATED_FILES)
+
+
+libnir_la_SOURCES =                                    \
+       $(NIR_FILES)                                    \
+       $(NIR_GENERATED_FILES)
 
 glsl_compiler_SOURCES = \
        $(GLSL_COMPILER_CXX_FILES)
@@ -149,11 +157,11 @@ glsl_compiler_SOURCES = \
 glsl_compiler_LDADD =                                  \
        libglsl.la                                      \
        $(top_builddir)/src/libglsl_util.la             \
+       $(top_builddir)/src/util/libmesautil.la         \
        $(PTHREAD_LIBS)
 
 glsl_test_SOURCES = \
        standalone_scaffolding.cpp \
-       tests/common.c \
        test.cpp \
        test_optpass.cpp \
        test_optpass.h
@@ -193,19 +201,23 @@ am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
 am__v_YACC_0 = @echo "  YACC    " $@;
 am__v_YACC_1 =
 
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
+LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
+
 glsl_parser.cpp glsl_parser.h: glsl_parser.yy
-       $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl_parser.h $<
+       $(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl_parser.h $(srcdir)/glsl_parser.yy
 
 glsl_lexer.cpp: glsl_lexer.ll
-       $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
+       $(LEX_GEN) -o $@ $(srcdir)/glsl_lexer.ll
 
 glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y
-       $(AM_V_at)$(MKDIR_P) glcpp
-       $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glcpp/glcpp-parse.h $<
+       $(MKDIR_GEN)
+       $(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glcpp/glcpp-parse.h $(srcdir)/glcpp/glcpp-parse.y
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-       $(AM_V_at)$(MKDIR_P) glcpp
-       $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
+       $(MKDIR_GEN)
+       $(LEX_GEN) -o $@ $(srcdir)/glcpp/glcpp-lex.l
 
 # Only the parsers (specifically the header files generated at the same time)
 # need to be in BUILT_SOURCES. Though if we list the parser headers YACC is
@@ -218,11 +230,7 @@ BUILT_SOURCES =                                            \
        glsl_lexer.cpp                                  \
        glcpp/glcpp-parse.c                             \
        glcpp/glcpp-lex.c                               \
-       nir/nir_builder_opcodes.h                               \
-       nir/nir_constant_expressions.c                  \
-       nir/nir_opcodes.c                               \
-       nir/nir_opcodes.h                               \
-       nir/nir_opt_algebraic.c
+       $(NIR_GENERATED_FILES)
 CLEANFILES =                                           \
        glcpp/glcpp-parse.h                             \
        glsl_parser.h                                   \
@@ -235,24 +243,35 @@ dist-hook:
        $(RM) glcpp/tests/*.out
        $(RM) glcpp/tests/subtest*/*.out
 
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+
 nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
-       $(MKDIR_P) nir;                                                 \
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/nir/nir_builder_opcodes_h.py > $@
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@
 
-nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py nir/nir_constant_expressions.h
-       $(MKDIR_P) nir;                                                 \
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/nir/nir_constant_expressions.py > $@
+nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@
 
 nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py
-       $(MKDIR_P) nir;                                                 \
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/nir/nir_opcodes_h.py > $@
-
-nir/nir.h: nir/nir_opcodes.h
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@
 
 nir/nir_opcodes.c: nir/nir_opcodes.py nir/nir_opcodes_c.py
-       $(MKDIR_P) nir;                                                 \
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/nir/nir_opcodes_c.py > $@
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_c.py > $@
 
 nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
-       $(MKDIR_P) nir;                                                 \
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/nir/nir_opt_algebraic.py > $@
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@
+
+nir_tests_control_flow_tests_SOURCES =                 \
+       nir/tests/control_flow_tests.cpp
+nir_tests_control_flow_tests_CFLAGS =                  \
+       $(PTHREAD_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)