r300/compiler: Clear empty registers after constant folding

[mesa.git] / src / glsl / Makefile

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index aa1922f3bec4a3d96f361a8d044e42e69874471d..83869b1d846704cf34a10a130d1e3ab7ed5651b5 100644 (file)
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -9,8 +9,7 @@ LIBNAME = glsl
 LIBGLCPP_SOURCES = \
        glcpp/glcpp-lex.c \
        glcpp/glcpp-parse.c \
-       glcpp/pp.c \
-       glcpp/xtalloc.c
+       glcpp/pp.c
 
 GLCPP_SOURCES = \
        $(LIBGLCPP_SOURCES) \
@@ -29,33 +28,43 @@ CXX_SOURCES = \
        glsl_parser.cpp \
        glsl_parser_extras.cpp \
        glsl_types.cpp \
+       glsl_symbol_table.cpp \
        hir_field_selection.cpp \
        ir_algebraic.cpp \
        ir_basic_block.cpp \
        ir_clone.cpp \
        ir_constant_expression.cpp \
        ir_constant_folding.cpp \
+       ir_constant_propagation.cpp \
        ir_constant_variable.cpp \
        ir_copy_propagation.cpp \
        ir.cpp \
        ir_dead_code.cpp \
        ir_dead_code_local.cpp \
+       ir_dead_functions.cpp \
        ir_div_to_mul_rcp.cpp \
+       ir_explog_to_explog2.cpp \
        ir_expression_flattening.cpp \
        ir_function_can_inline.cpp \
        ir_function.cpp \
        ir_function_inlining.cpp \
        ir_hierarchical_visitor.cpp \
        ir_hv_accept.cpp \
-       ir_if_return.cpp \
        ir_if_simplification.cpp \
        ir_if_to_cond_assign.cpp \
        ir_import_prototypes.cpp \
+       ir_lower_jumps.cpp \
        ir_mat_op_to_vec.cpp \
        ir_mod_to_fract.cpp \
+       ir_noop_swizzle.cpp \
        ir_print_visitor.cpp \
        ir_reader.cpp \
+       ir_rvalue_visitor.cpp \
+       ir_set_program_inouts.cpp \
+       ir_structure_splitting.cpp \
+       ir_sub_to_add_neg.cpp \
        ir_swizzle_swizzle.cpp \
+       ir_tree_grafting.cpp \
        ir_validate.cpp \
        ir_variable.cpp \
        ir_variable_refcount.cpp \
@@ -63,11 +72,18 @@ CXX_SOURCES = \
        ir_vec_index_to_swizzle.cpp \
        linker.cpp \
        link_functions.cpp \
+       loop_analysis.cpp \
+       loop_controls.cpp \
+       loop_unroll.cpp \
+       lower_noise.cpp \
+       lower_texture_projection.cpp \
+       lower_variable_index_to_cond_assign.cpp \
+       opt_redundant_jumps.cpp \
        s_expression.cpp
 
 LIBS = \
        $(TOP)/src/glsl/libglsl.a \
-       $(shell pkg-config --libs talloc)
+       $(TALLOC_LIBS)
 
 APPS = glsl_compiler glcpp/glcpp
 
@@ -96,10 +112,10 @@ OBJECTS = \
        $(CXX_SOURCES:.cpp=.o)
 
 INCLUDES = \
+       $(TALLOC_CFLAGS) \
        -I. \
        -I../mesa \
        -I../mapi \
-       -I../mesa/program \
        -I../../include \
        $(LIBRARY_INCLUDES)
 
@@ -123,7 +139,7 @@ depend: $(ALL_SOURCES) Makefile
 
 # Remove .o and backup files
 clean:
-       rm -f $(OBJECTS) lib$(LIBNAME).a depend depend.bak
+       rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak
        -rm -f $(APPS)
 
 # Dummy target
@@ -146,18 +162,24 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
        $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 glsl_lexer.cpp: glsl_lexer.lpp
-       flex --never-interactive --outfile="$@"  $<
+       flex --nounistd -o$@  $<
 
 glsl_parser.cpp: glsl_parser.ypp
-       bison -v -o "$@" --defines=glsl_parser.h $<
+       bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-       flex --never-interactive --outfile="$@" $<
+       flex --nounistd -o$@  $<
 
 glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
        bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
 
-builtin_function.cpp: builtins/*/*
-       ./builtins/tools/generate_builtins.pl > builtin_function.cpp
+builtins: builtin_function.cpp builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py
+       @echo Bootstrapping the compiler...
+       cp builtins/tools/builtin_function.cpp .
+       make glsl_compiler
+       @echo Regenerating builtin_function.cpp...
+       ./builtins/tools/generate_builtins.py > builtin_function.cpp
+       @echo Rebuilding the real compiler...
+       make glsl_compiler
 
 -include depend