glsl/linker: handle errors when a variable local size is used

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

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index 23c2a6b24c2cf4dac5fa9dd0afe2072941868f8e..80dfb737fb276afe80a4f14d0bc15d1fb48a8ac8 100644 (file)
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -25,6 +25,7 @@ EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README \
        glsl/TODO glsl/glcpp/README                     \
        glsl/glsl_lexer.ll                              \
        glsl/glsl_parser.yy                             \
+       glsl/ir_expression_operation.py                 \
        glsl/glcpp/glcpp-lex.l                          \
        glsl/glcpp/glcpp-parse.y                        \
        SConscript.glsl
@@ -32,10 +33,12 @@ EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README       \
 TESTS += glsl/glcpp/tests/glcpp-test                   \
        glsl/glcpp/tests/glcpp-test-cr-lf               \
        glsl/tests/blob-test                            \
+       glsl/tests/cache-test                           \
        glsl/tests/general-ir-test                      \
        glsl/tests/optimization-test                    \
        glsl/tests/sampler-types-test                   \
-       glsl/tests/uniform-initializer-test
+       glsl/tests/uniform-initializer-test             \
+       glsl/tests/warnings-test
 
 TESTS_ENVIRONMENT= \
        export PYTHON2=$(PYTHON2); \
@@ -45,6 +48,7 @@ check_PROGRAMS +=                                     \
        glsl/glcpp/glcpp                                \
        glsl/glsl_test                                  \
        glsl/tests/blob-test                            \
+       glsl/tests/cache-test                           \
        glsl/tests/general-ir-test                      \
        glsl/tests/sampler-types-test                   \
        glsl/tests/uniform-initializer-test
@@ -56,6 +60,11 @@ glsl_tests_blob_test_SOURCES =                               \
 glsl_tests_blob_test_LDADD =                           \
        glsl/libglsl.la
 
+glsl_tests_cache_test_SOURCES =                                \
+       glsl/tests/cache_test.c
+glsl_tests_cache_test_LDADD =                          \
+       glsl/libglsl.la
+
 glsl_tests_general_ir_test_SOURCES =                   \
        glsl/tests/builtin_variable_test.cpp            \
        glsl/tests/invalidate_locations_test.cpp        \
@@ -115,11 +124,12 @@ glsl_libglsl_la_LIBADD = \
        glsl/libglcpp.la
 
 glsl_libglsl_la_SOURCES =                              \
-       glsl/glsl_lexer.cpp                             \
-       glsl/glsl_parser.cpp                            \
-       glsl/glsl_parser.h                              \
+       $(LIBGLSL_GENERATED_FILES)                      \
        $(LIBGLSL_FILES)
 
+if ENABLE_SHADER_CACHE
+glsl_libglsl_la_SOURCES += $(LIBGLSL_SHADER_CACHE_FILES)
+endif
 
 glsl_libstandalone_la_SOURCES = \
        $(GLSL_COMPILER_CXX_FILES)
@@ -179,6 +189,7 @@ am__v_YACC_1 =
 
 YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
 LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
 glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
        $(MKDIR_GEN)
@@ -196,6 +207,18 @@ glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l
        $(MKDIR_GEN)
        $(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l
 
+glsl/ir_expression_operation.h: glsl/ir_expression_operation.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py enum > $@ || ($(RM) $@; false)
+
+glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py constant > $@ || ($(RM) $@; false)
+
+glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false)
+
 # 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
 # called for the .c/.cpp file and the .h files. By listing the .c/.cpp files
@@ -205,6 +228,9 @@ glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l
 BUILT_SOURCES +=                                       \
        glsl/glsl_parser.cpp                            \
        glsl/glsl_lexer.cpp                             \
+       glsl/ir_expression_operation.h                  \
+       glsl/ir_expression_operation_constant.h         \
+       glsl/ir_expression_operation_strings.h          \
        glsl/glcpp/glcpp-parse.c                        \
        glsl/glcpp/glcpp-lex.c
 CLEANFILES +=                                          \
@@ -212,6 +238,9 @@ CLEANFILES +=                                               \
        glsl/glsl_parser.h                              \
        glsl/glsl_parser.cpp                            \
        glsl/glsl_lexer.cpp                             \
+       glsl/ir_expression_operation.h                  \
+       glsl/ir_expression_operation_constant.h         \
+       glsl/ir_expression_operation_strings.h          \
        glsl/glcpp/glcpp-parse.c                        \
        glsl/glcpp/glcpp-lex.c