glsl: Modify strategy for accumulating conditions when lowering if-statements

[mesa.git] / src / glsl / Makefile

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 4100414a37d96c405ed3a69c18c63099ead464ea..c20a6c9edd95f4aba570b57def4be45383e8b894 100644 (file)
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -39,6 +39,7 @@ CXX_SOURCES = \
        ir.cpp \
        ir_expression_flattening.cpp \
        ir_function_can_inline.cpp \
+       ir_function_detect_recursion.cpp \
        ir_function.cpp \
        ir_hierarchical_visitor.cpp \
        ir_hv_accept.cpp \
@@ -88,18 +89,32 @@ CXX_SOURCES = \
 LIBS = \
        $(TOP)/src/glsl/libglsl.a
 
-APPS = glsl_compiler glcpp/glcpp
+APPS = glsl_compiler glsl_test glcpp/glcpp
 
 GLSL2_C_SOURCES = \
        ../mesa/program/hash_table.c \
        ../mesa/program/symbol_table.c
 GLSL2_CXX_SOURCES = \
-       main.cpp
+       main.cpp \
+       standalone_scaffolding.cpp
 
 GLSL2_OBJECTS = \
        $(GLSL2_C_SOURCES:.c=.o) \
        $(GLSL2_CXX_SOURCES:.cpp=.o)
 
+TEST_C_SOURCES = \
+       ../mesa/program/hash_table.c \
+       ../mesa/program/symbol_table.c
+
+TEST_CXX_SOURCES = \
+       standalone_scaffolding.cpp \
+       test.cpp \
+       test_optpass.cpp
+
+TEST_OBJECTS = \
+       $(TEST_C_SOURCES:.c=.o) \
+       $(TEST_CXX_SOURCES:.cpp=.o)
+
 ### Basic defines ###
 
 DEFINES += \
@@ -128,7 +143,9 @@ ALL_SOURCES = \
        $(C_SOURCES) \
        $(CXX_SOURCES) \
        $(GLSL2_CXX_SOURCES) \
-       $(GLSL2_C_SOURCES)
+       $(GLSL2_C_SOURCES) \
+       $(TEST_CXX_SOURCES) \
+       $(TEST_C_SOURCES)
 
 ##### TARGETS #####
 
@@ -147,14 +164,15 @@ depend: $(ALL_SOURCES) Makefile
        rm -f depend
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
+       $(MKDEP) $(MKDEP_OPTIONS) -a -p $(DRICORE_OBJ_DIR)/ $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
 
 # Remove .o and backup files
 clean: clean-dricore
-       rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler
+       rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(TEST_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler
        -rm -f $(APPS)
 
 clean-dricore:
-       -rm -f $(DRICORE_OBJ_DIR) $(TOP)/$(LIB_DIR)/libglsl.so libglsl.so
+       -rm -f $(OBJECTS_DRICORE) $(TOP)/$(LIB_DIR)/libglsl.so libglsl.so
 
 ifneq (,$(DRICORE_GLSL_LIBS))
 DRICORE_INSTALL_TARGET = install-dricore
@@ -173,6 +191,9 @@ install-dricore: default
 glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
        $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
 
+glsl_test: $(TEST_OBJECTS) libglsl.a builtin_stubs.o
+       $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) builtin_stubs.o $(LIBS) -o $@
+
 glcpp: glcpp/glcpp
 glcpp/glcpp: $(GLCPP_OBJECTS)
        $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) -o $@