aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/Makefile.sources
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
committermarha <marha@users.sourceforge.net>2015-02-22 21:39:56 +0100
commit462f18c7b25fe3e467f837647d07ab0a78aa8d2b (patch)
treefc8013c0a1bac05a1945846c1697e973f4c35013 /mesalib/src/glsl/Makefile.sources
parent36f711ee12b6dd5184198abed3aa551efb585587 (diff)
downloadvcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.gz
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.tar.bz2
vcxsrv-462f18c7b25fe3e467f837647d07ab0a78aa8d2b.zip
Merged origin/release (checked in because wanted to merge new stuff)
Diffstat (limited to 'mesalib/src/glsl/Makefile.sources')
-rw-r--r--mesalib/src/glsl/Makefile.sources280
1 files changed, 179 insertions, 101 deletions
diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources
index 676fa0d7a..d0210d170 100644
--- a/mesalib/src/glsl/Makefile.sources
+++ b/mesalib/src/glsl/Makefile.sources
@@ -1,119 +1,197 @@
# shared source lists for Makefile, SConscript, and Android.mk
-GLSL_SRCDIR = $(top_srcdir)/src/glsl
-GLSL_BUILDDIR = $(top_builddir)/src/glsl
-
# libglcpp
LIBGLCPP_FILES = \
- $(GLSL_SRCDIR)/glcpp/pp.c
+ glcpp/glcpp.h \
+ glcpp/pp.c
LIBGLCPP_GENERATED_FILES = \
- $(GLSL_BUILDDIR)/glcpp/glcpp-lex.c \
- $(GLSL_BUILDDIR)/glcpp/glcpp-parse.c
+ glcpp/glcpp-lex.c \
+ glcpp/glcpp-parse.c
+
+NIR_GENERATED_FILES = \
+ nir/nir_builder_opcodes.h \
+ nir/nir_constant_expressions.c \
+ nir/nir_opcodes.c \
+ nir/nir_opcodes.h \
+ nir/nir_opt_algebraic.c
+
+NIR_FILES = \
+ nir/glsl_to_nir.cpp \
+ nir/glsl_to_nir.h \
+ nir/nir.c \
+ nir/nir.h \
+ nir/nir_constant_expressions.h \
+ nir/nir_dominance.c \
+ nir/nir_from_ssa.c \
+ nir/nir_intrinsics.c \
+ nir/nir_intrinsics.h \
+ nir/nir_live_variables.c \
+ nir/nir_lower_alu_to_scalar.c \
+ nir/nir_lower_atomics.c \
+ nir/nir_lower_global_vars_to_local.c \
+ nir/nir_lower_locals_to_regs.c \
+ nir/nir_lower_io.c \
+ nir/nir_lower_phis_to_scalar.c \
+ nir/nir_lower_samplers.cpp \
+ nir/nir_lower_system_values.c \
+ nir/nir_lower_to_source_mods.c \
+ nir/nir_lower_vars_to_ssa.c \
+ nir/nir_lower_var_copies.c \
+ nir/nir_lower_vec_to_movs.c \
+ nir/nir_metadata.c \
+ nir/nir_opt_constant_folding.c \
+ nir/nir_opt_copy_propagate.c \
+ nir/nir_opt_cse.c \
+ nir/nir_opt_dce.c \
+ nir/nir_opt_gcm.c \
+ nir/nir_opt_global_to_local.c \
+ nir/nir_opt_peephole_select.c \
+ nir/nir_opt_remove_phis.c \
+ nir/nir_print.c \
+ nir/nir_remove_dead_variables.c \
+ nir/nir_search.c \
+ nir/nir_search.h \
+ nir/nir_split_var_copies.c \
+ nir/nir_to_ssa.c \
+ nir/nir_types.h \
+ nir/nir_validate.c \
+ nir/nir_worklist.c \
+ nir/nir_worklist.h \
+ nir/nir_types.cpp \
+ $(NIR_GENERATED_FILES)
# libglsl
LIBGLSL_FILES = \
- $(GLSL_SRCDIR)/ast_array_index.cpp \
- $(GLSL_SRCDIR)/ast_expr.cpp \
- $(GLSL_SRCDIR)/ast_function.cpp \
- $(GLSL_SRCDIR)/ast_to_hir.cpp \
- $(GLSL_SRCDIR)/ast_type.cpp \
- $(GLSL_SRCDIR)/builtin_functions.cpp \
- $(GLSL_SRCDIR)/builtin_types.cpp \
- $(GLSL_SRCDIR)/builtin_variables.cpp \
- $(GLSL_SRCDIR)/glsl_parser_extras.cpp \
- $(GLSL_SRCDIR)/glsl_types.cpp \
- $(GLSL_SRCDIR)/glsl_symbol_table.cpp \
- $(GLSL_SRCDIR)/hir_field_selection.cpp \
- $(GLSL_SRCDIR)/ir_basic_block.cpp \
- $(GLSL_SRCDIR)/ir_builder.cpp \
- $(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 \
- $(GLSL_SRCDIR)/ir_function.cpp \
- $(GLSL_SRCDIR)/ir_hierarchical_visitor.cpp \
- $(GLSL_SRCDIR)/ir_hv_accept.cpp \
- $(GLSL_SRCDIR)/ir_import_prototypes.cpp \
- $(GLSL_SRCDIR)/ir_print_visitor.cpp \
- $(GLSL_SRCDIR)/ir_reader.cpp \
- $(GLSL_SRCDIR)/ir_rvalue_visitor.cpp \
- $(GLSL_SRCDIR)/ir_set_program_inouts.cpp \
- $(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 \
- $(GLSL_SRCDIR)/link_uniform_initializers.cpp \
- $(GLSL_SRCDIR)/link_uniform_block_active_visitor.cpp \
- $(GLSL_SRCDIR)/link_uniform_blocks.cpp \
- $(GLSL_SRCDIR)/link_varyings.cpp \
- $(GLSL_SRCDIR)/loop_analysis.cpp \
- $(GLSL_SRCDIR)/loop_controls.cpp \
- $(GLSL_SRCDIR)/loop_unroll.cpp \
- $(GLSL_SRCDIR)/lower_clip_distance.cpp \
- $(GLSL_SRCDIR)/lower_const_arrays_to_uniforms.cpp \
- $(GLSL_SRCDIR)/lower_discard.cpp \
- $(GLSL_SRCDIR)/lower_discard_flow.cpp \
- $(GLSL_SRCDIR)/lower_if_to_cond_assign.cpp \
- $(GLSL_SRCDIR)/lower_instructions.cpp \
- $(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 \
- $(GLSL_SRCDIR)/lower_texture_projection.cpp \
- $(GLSL_SRCDIR)/lower_variable_index_to_cond_assign.cpp \
- $(GLSL_SRCDIR)/lower_vec_index_to_cond_assign.cpp \
- $(GLSL_SRCDIR)/lower_vec_index_to_swizzle.cpp \
- $(GLSL_SRCDIR)/lower_vector.cpp \
- $(GLSL_SRCDIR)/lower_vector_insert.cpp \
- $(GLSL_SRCDIR)/lower_vertex_id.cpp \
- $(GLSL_SRCDIR)/lower_output_reads.cpp \
- $(GLSL_SRCDIR)/lower_ubo_reference.cpp \
- $(GLSL_SRCDIR)/opt_algebraic.cpp \
- $(GLSL_SRCDIR)/opt_array_splitting.cpp \
- $(GLSL_SRCDIR)/opt_constant_folding.cpp \
- $(GLSL_SRCDIR)/opt_constant_propagation.cpp \
- $(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_variables.cpp \
- $(GLSL_SRCDIR)/opt_dead_builtin_varyings.cpp \
- $(GLSL_SRCDIR)/opt_dead_code.cpp \
- $(GLSL_SRCDIR)/opt_dead_code_local.cpp \
- $(GLSL_SRCDIR)/opt_dead_functions.cpp \
- $(GLSL_SRCDIR)/opt_flatten_nested_if_blocks.cpp \
- $(GLSL_SRCDIR)/opt_flip_matrices.cpp \
- $(GLSL_SRCDIR)/opt_function_inlining.cpp \
- $(GLSL_SRCDIR)/opt_if_simplification.cpp \
- $(GLSL_SRCDIR)/opt_minmax.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
+ ast.h \
+ ast_array_index.cpp \
+ ast_expr.cpp \
+ ast_function.cpp \
+ ast_to_hir.cpp \
+ ast_type.cpp \
+ blob.c \
+ blob.h \
+ builtin_functions.cpp \
+ builtin_type_macros.h \
+ builtin_types.cpp \
+ builtin_variables.cpp \
+ glsl_parser_extras.cpp \
+ glsl_parser_extras.h \
+ glsl_symbol_table.cpp \
+ glsl_symbol_table.h \
+ glsl_types.cpp \
+ glsl_types.h \
+ hir_field_selection.cpp \
+ ir_basic_block.cpp \
+ ir_basic_block.h \
+ ir_builder.cpp \
+ ir_builder.h \
+ ir_clone.cpp \
+ ir_constant_expression.cpp \
+ ir.cpp \
+ ir.h \
+ ir_equals.cpp \
+ ir_expression_flattening.cpp \
+ ir_expression_flattening.h \
+ ir_function_can_inline.cpp \
+ ir_function_detect_recursion.cpp \
+ ir_function_inlining.h \
+ ir_function.cpp \
+ ir_hierarchical_visitor.cpp \
+ ir_hierarchical_visitor.h \
+ ir_hv_accept.cpp \
+ ir_import_prototypes.cpp \
+ ir_optimization.h \
+ ir_print_visitor.cpp \
+ ir_print_visitor.h \
+ ir_reader.cpp \
+ ir_reader.h \
+ ir_rvalue_visitor.cpp \
+ ir_rvalue_visitor.h \
+ ir_set_program_inouts.cpp \
+ ir_uniform.h \
+ ir_validate.cpp \
+ ir_variable_refcount.cpp \
+ ir_variable_refcount.h \
+ ir_visitor.h \
+ linker.cpp \
+ linker.h \
+ link_atomics.cpp \
+ link_functions.cpp \
+ link_interface_blocks.cpp \
+ link_uniforms.cpp \
+ link_uniform_initializers.cpp \
+ link_uniform_block_active_visitor.cpp \
+ link_uniform_block_active_visitor.h \
+ link_uniform_blocks.cpp \
+ link_varyings.cpp \
+ link_varyings.h \
+ list.h \
+ loop_analysis.cpp \
+ loop_analysis.h \
+ loop_controls.cpp \
+ loop_unroll.cpp \
+ lower_clip_distance.cpp \
+ lower_const_arrays_to_uniforms.cpp \
+ lower_discard.cpp \
+ lower_discard_flow.cpp \
+ lower_if_to_cond_assign.cpp \
+ lower_instructions.cpp \
+ lower_jumps.cpp \
+ lower_mat_op_to_vec.cpp \
+ lower_noise.cpp \
+ lower_offset_array.cpp \
+ lower_packed_varyings.cpp \
+ lower_named_interface_blocks.cpp \
+ lower_packing_builtins.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 \
+ lower_vector_insert.cpp \
+ lower_vertex_id.cpp \
+ lower_output_reads.cpp \
+ lower_ubo_reference.cpp \
+ opt_algebraic.cpp \
+ opt_array_splitting.cpp \
+ opt_constant_folding.cpp \
+ opt_constant_propagation.cpp \
+ opt_constant_variable.cpp \
+ opt_copy_propagation.cpp \
+ opt_copy_propagation_elements.cpp \
+ opt_cse.cpp \
+ opt_dead_builtin_variables.cpp \
+ opt_dead_builtin_varyings.cpp \
+ opt_dead_code.cpp \
+ opt_dead_code_local.cpp \
+ opt_dead_functions.cpp \
+ opt_flatten_nested_if_blocks.cpp \
+ opt_flip_matrices.cpp \
+ opt_function_inlining.cpp \
+ opt_if_simplification.cpp \
+ opt_minmax.cpp \
+ opt_noop_swizzle.cpp \
+ opt_rebalance_tree.cpp \
+ opt_redundant_jumps.cpp \
+ opt_structure_splitting.cpp \
+ opt_swizzle_swizzle.cpp \
+ opt_tree_grafting.cpp \
+ opt_vectorize.cpp \
+ program.h \
+ s_expression.cpp \
+ s_expression.h
# glsl_compiler
GLSL_COMPILER_CXX_FILES = \
- $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
- $(GLSL_SRCDIR)/main.cpp
+ standalone_scaffolding.cpp \
+ standalone_scaffolding.h \
+ main.cpp
# libglsl generated sources
LIBGLSL_GENERATED_CXX_FILES = \
- $(GLSL_BUILDDIR)/glsl_lexer.cpp \
- $(GLSL_BUILDDIR)/glsl_parser.cpp
+ glsl_lexer.cpp \
+ glsl_parser.cpp