gallium/ilo: cleanup intel_winsys.h

[mesa.git] / src / glsl / Makefile.sources

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 3e706efeaa93f19cf6ac5f41ab1dc6a89acf497e..2131ddafbd58cda6a0bf1dafa2b0b4e90b88c0ba 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -6,7 +6,6 @@ GLSL_BUILDDIR = $(top_builddir)/src/glsl
 # libglcpp
 
 LIBGLCPP_FILES = \
-       $(GLSL_SRCDIR)/ralloc.c \
        $(GLSL_SRCDIR)/glcpp/pp.c
 
 LIBGLCPP_GENERATED_FILES = \
@@ -33,6 +32,7 @@ LIBGLSL_FILES = \
        $(GLSL_SRCDIR)/ir_clone.cpp \
        $(GLSL_SRCDIR)/ir_constant_expression.cpp \
        $(GLSL_SRCDIR)/ir.cpp \
+       $(GLSL_SRCDIR)/ir_equals.cpp \
        $(GLSL_SRCDIR)/ir_expression_flattening.cpp \
        $(GLSL_SRCDIR)/ir_function_can_inline.cpp \
        $(GLSL_SRCDIR)/ir_function_detect_recursion.cpp \
@@ -47,6 +47,7 @@ LIBGLSL_FILES = \
        $(GLSL_SRCDIR)/ir_validate.cpp \
        $(GLSL_SRCDIR)/ir_variable_refcount.cpp \
        $(GLSL_SRCDIR)/linker.cpp \
+       $(GLSL_SRCDIR)/link_atomics.cpp \
        $(GLSL_SRCDIR)/link_functions.cpp \
        $(GLSL_SRCDIR)/link_interface_blocks.cpp \
        $(GLSL_SRCDIR)/link_uniforms.cpp \
@@ -65,6 +66,7 @@ LIBGLSL_FILES = \
        $(GLSL_SRCDIR)/lower_jumps.cpp \
        $(GLSL_SRCDIR)/lower_mat_op_to_vec.cpp \
        $(GLSL_SRCDIR)/lower_noise.cpp \
+       $(GLSL_SRCDIR)/lower_offset_array.cpp \
        $(GLSL_SRCDIR)/lower_packed_varyings.cpp \
        $(GLSL_SRCDIR)/lower_named_interface_blocks.cpp \
        $(GLSL_SRCDIR)/lower_packing_builtins.cpp \
@@ -83,6 +85,7 @@ LIBGLSL_FILES = \
        $(GLSL_SRCDIR)/opt_constant_variable.cpp \
        $(GLSL_SRCDIR)/opt_copy_propagation.cpp \
        $(GLSL_SRCDIR)/opt_copy_propagation_elements.cpp \
+       $(GLSL_SRCDIR)/opt_cse.cpp \
        $(GLSL_SRCDIR)/opt_dead_builtin_varyings.cpp \
        $(GLSL_SRCDIR)/opt_dead_code.cpp \
        $(GLSL_SRCDIR)/opt_dead_code_local.cpp \
@@ -92,10 +95,12 @@ LIBGLSL_FILES = \
        $(GLSL_SRCDIR)/opt_function_inlining.cpp \
        $(GLSL_SRCDIR)/opt_if_simplification.cpp \
        $(GLSL_SRCDIR)/opt_noop_swizzle.cpp \
+       $(GLSL_SRCDIR)/opt_rebalance_tree.cpp \
        $(GLSL_SRCDIR)/opt_redundant_jumps.cpp \
        $(GLSL_SRCDIR)/opt_structure_splitting.cpp \
        $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
        $(GLSL_SRCDIR)/opt_tree_grafting.cpp \
+       $(GLSL_SRCDIR)/opt_vectorize.cpp \
        $(GLSL_SRCDIR)/s_expression.cpp \
        $(GLSL_SRCDIR)/strtod.c
 
@@ -105,20 +110,7 @@ GLSL_COMPILER_CXX_FILES = \
        $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
        $(GLSL_SRCDIR)/main.cpp
 
-# builtin_compiler
-#
-# This is built before libglsl to generate builtin_function.cpp for libglsl.
-# For this to work, a dummy version of builtin_function.cpp,
-# builtin_stubs.cpp, is used.
-
-BUILTIN_COMPILER_CXX_FILES = \
-       $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp
-
-BUILTIN_COMPILER_GENERATED_CXX_FILES = \
-       $(GLSL_BUILDDIR)/glsl_lexer.cpp \
-       $(GLSL_BUILDDIR)/glsl_parser.cpp
-
 # libglsl generated sources
 LIBGLSL_GENERATED_CXX_FILES = \
-       $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
-       $(GLSL_BUILDDIR)/builtin_function.cpp
+       $(GLSL_BUILDDIR)/glsl_lexer.cpp \
+       $(GLSL_BUILDDIR)/glsl_parser.cpp