glsl: Improve the local dead code optimization to eliminate unused channels.

[mesa.git] / src / glsl / Makefile

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index e0776c1b55d7b995dba4ff5198f75f354a1f9fce..7c80c95d804c3eca2357fbf589ae470de1cbbbeb 100644 (file)
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -7,99 +7,52 @@ include $(TOP)/configs/current
 
 LIBNAME = glsl
 
-LIBGLCPP_SOURCES = \
-       glcpp/glcpp-lex.c \
-       glcpp/glcpp-parse.c \
-       glcpp/pp.c
+include Makefile.sources
 
 GLCPP_SOURCES = \
-       $(LIBGLCPP_SOURCES) \
+       $(LIBGLCPP_GENERATED_FILES) \
+       $(LIBGLCPP_FILES) \
        ralloc.c \
        glcpp/glcpp.c
 
 C_SOURCES = \
-       strtod.c \
-       ralloc.c \
-       $(LIBGLCPP_SOURCES)
+       $(LIBGLCPP_GENERATED_FILES) \
+       $(LIBGLCPP_FILES) \
+       $(LIBGLSL_FILES)
 
+# common sources for builtin_compiler and libglsl
 CXX_SOURCES = \
-       ast_expr.cpp \
-       ast_function.cpp \
-       ast_to_hir.cpp \
-       ast_type.cpp \
-       glsl_lexer.cpp \
-       glsl_parser.cpp \
-       glsl_parser_extras.cpp \
-       glsl_types.cpp \
-       glsl_symbol_table.cpp \
-       hir_field_selection.cpp \
-       ir_basic_block.cpp \
-       ir_clone.cpp \
-       ir_constant_expression.cpp \
-       ir.cpp \
-       ir_expression_flattening.cpp \
-       ir_function_can_inline.cpp \
-       ir_function.cpp \
-       ir_hierarchical_visitor.cpp \
-       ir_hv_accept.cpp \
-       ir_import_prototypes.cpp \
-       ir_print_visitor.cpp \
-       ir_reader.cpp \
-       ir_rvalue_visitor.cpp \
-       ir_set_program_inouts.cpp \
-       ir_validate.cpp \
-       ir_variable.cpp \
-       ir_variable_refcount.cpp \
-       linker.cpp \
-       link_functions.cpp \
-       loop_analysis.cpp \
-       loop_controls.cpp \
-       loop_unroll.cpp \
-       lower_discard.cpp \
-       lower_if_to_cond_assign.cpp \
-       lower_instructions.cpp \
-       lower_jumps.cpp \
-       lower_mat_op_to_vec.cpp \
-       lower_noise.cpp \
-       lower_texture_projection.cpp \
-       lower_variable_index_to_cond_assign.cpp \
-       lower_vec_index_to_cond_assign.cpp \
-       lower_vec_index_to_swizzle.cpp \
-       lower_vector.cpp \
-       opt_algebraic.cpp \
-       opt_constant_folding.cpp \
-       opt_constant_propagation.cpp \
-       opt_constant_variable.cpp \
-       opt_copy_propagation.cpp \
-       opt_copy_propagation_elements.cpp \
-       opt_dead_code.cpp \
-       opt_dead_code_local.cpp \
-       opt_dead_functions.cpp \
-       opt_discard_simplification.cpp \
-       opt_function_inlining.cpp \
-       opt_if_simplification.cpp \
-       opt_noop_swizzle.cpp \
-       opt_redundant_jumps.cpp \
-       opt_structure_splitting.cpp \
-       opt_swizzle_swizzle.cpp \
-       opt_tree_grafting.cpp \
-       s_expression.cpp
+       $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+       $(LIBGLSL_CXX_FILES)
 
 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
+       $(GLSL_COMPILER_CXX_FILES)
 
 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 +81,9 @@ ALL_SOURCES = \
        $(C_SOURCES) \
        $(CXX_SOURCES) \
        $(GLSL2_CXX_SOURCES) \
-       $(GLSL2_C_SOURCES)
+       $(GLSL2_C_SOURCES) \
+       $(TEST_CXX_SOURCES) \
+       $(TEST_C_SOURCES)
 
 ##### TARGETS #####
 
@@ -147,10 +102,11 @@ 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:
@@ -170,8 +126,11 @@ install-dricore: default
 
 ##### RULES #####
 
-glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
-       $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
+glsl_compiler: $(GLSL2_OBJECTS) libglsl.a
+       $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) $(LIBS) -o $@
+
+glsl_test: $(TEST_OBJECTS) libglsl.a
+       $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) $(LIBS) -o $@
 
 glcpp: glcpp/glcpp
 glcpp/glcpp: $(GLCPP_OBJECTS)
@@ -206,7 +165,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
 builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
        $(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
 
-builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
+builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/glsl/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
        @echo Regenerating builtin_function.cpp...
        $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp