From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 11 Apr 2016 12:23:17 +0000 (+0100)
Subject: compiler: remove {glsl,nir}/Makefile.sources
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d67780b80df91bd0326b77dcc8d90af719e087e;p=mesa.git

compiler: remove {glsl,nir}/Makefile.sources

No longer used as of last commit.

v2: Rebase.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net> (v1)
---

diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index f1c70c2a72a..6e5ae7a4f7b 100644
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -61,7 +61,6 @@ EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README	\
 	glsl/glsl_parser.yy				\
 	glsl/glcpp/glcpp-lex.l				\
 	glsl/glcpp/glcpp-parse.y			\
-	glsl/Makefile.sources				\
 	SConscript.glsl
 
 TESTS += glsl/glcpp/tests/glcpp-test			\
@@ -321,5 +320,4 @@ EXTRA_DIST += \
 	nir/nir_opcodes_c.py				\
 	nir/nir_opcodes_h.py				\
 	nir/nir_opt_algebraic.py			\
-	nir/tests					\
-	nir/Makefile.sources
+	nir/tests
diff --git a/src/compiler/glsl/Makefile.am b/src/compiler/glsl/Makefile.am
deleted file mode 100644
index 9954b812403..00000000000
--- a/src/compiler/glsl/Makefile.am
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright © 2012 Jon TURNEY
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	-I$(top_srcdir)/src/glsl/glcpp \
-	-I$(top_srcdir)/src/gtest/include \
-	$(DEFINES)
-AM_CFLAGS = \
-	$(VISIBILITY_CFLAGS) \
-	$(MSVC2013_COMPAT_CFLAGS)
-AM_CXXFLAGS = \
-	$(VISIBILITY_CXXFLAGS) \
-	$(MSVC2013_COMPAT_CXXFLAGS)
-
-EXTRA_DIST = tests glcpp/tests README TODO glcpp/README	\
-	glsl_lexer.ll					\
-	glsl_parser.yy					\
-	glcpp/glcpp-lex.l				\
-	glcpp/glcpp-parse.y				\
-	SConscript
-
-include Makefile.sources
-
-TESTS = glcpp/tests/glcpp-test				\
-	glcpp/tests/glcpp-test-cr-lf			\
-	tests/blob-test					\
-	tests/general-ir-test				\
-	tests/optimization-test				\
-	tests/sampler-types-test                        \
-	tests/uniform-initializer-test
-
-TESTS_ENVIRONMENT= \
-	export PYTHON2=$(PYTHON2); \
-	export PYTHON_FLAGS=$(PYTHON_FLAGS);
-
-noinst_LTLIBRARIES = libglsl.la libglcpp.la
-check_PROGRAMS =					\
-	glcpp/glcpp					\
-	glsl_test					\
-	tests/blob-test					\
-	tests/general-ir-test				\
-	tests/sampler-types-test			\
-	tests/uniform-initializer-test
-
-noinst_PROGRAMS = glsl_compiler
-
-tests_blob_test_SOURCES =				\
-	tests/blob_test.c
-tests_blob_test_LDADD =					\
-	$(top_builddir)/src/glsl/libglsl.la
-
-tests_general_ir_test_SOURCES =		\
-	standalone_scaffolding.cpp			\
-	tests/builtin_variable_test.cpp			\
-	tests/invalidate_locations_test.cpp		\
-	tests/general_ir_test.cpp			\
-	tests/varyings_test.cpp
-tests_general_ir_test_CFLAGS =				\
-	$(PTHREAD_CFLAGS)
-tests_general_ir_test_LDADD =				\
-	$(top_builddir)/src/gtest/libgtest.la		\
-	$(top_builddir)/src/glsl/libglsl.la		\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)
-
-tests_uniform_initializer_test_SOURCES =		\
-	tests/copy_constant_to_storage_tests.cpp	\
-	tests/set_uniform_initializer_tests.cpp		\
-	tests/uniform_initializer_utils.cpp		\
-	tests/uniform_initializer_utils.h
-tests_uniform_initializer_test_CFLAGS =			\
-	$(PTHREAD_CFLAGS)
-tests_uniform_initializer_test_LDADD =			\
-	$(top_builddir)/src/gtest/libgtest.la		\
-	$(top_builddir)/src/glsl/libglsl.la		\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)
-
-tests_sampler_types_test_SOURCES =			\
-	tests/sampler_types_test.cpp
-tests_sampler_types_test_CFLAGS =			\
-	$(PTHREAD_CFLAGS)
-tests_sampler_types_test_LDADD =			\
-	$(top_builddir)/src/gtest/libgtest.la		\
-	$(top_builddir)/src/glsl/libglsl.la		\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)
-
-libglcpp_la_LIBADD =					\
-	$(top_builddir)/src/util/libmesautil.la
-libglcpp_la_SOURCES =					\
-	glcpp/glcpp-lex.c				\
-	glcpp/glcpp-parse.c				\
-	glcpp/glcpp-parse.h				\
-	$(LIBGLCPP_FILES)
-
-glcpp_glcpp_SOURCES =					\
-	glcpp/glcpp.c
-glcpp_glcpp_LDADD =					\
-	libglcpp.la					\
-	$(top_builddir)/src/libglsl_util.la		\
-	-lm
-
-libglsl_la_LIBADD = \
-	$(top_builddir)/src/compiler/nir/libnir.la \
-	libglcpp.la
-
-libglsl_la_SOURCES =					\
-	glsl_lexer.cpp					\
-	glsl_parser.cpp					\
-	glsl_parser.h					\
-	$(LIBGLSL_FILES)
-
-
-glsl_compiler_SOURCES = \
-	$(GLSL_COMPILER_CXX_FILES)
-
-glsl_compiler_LDADD =					\
-	libglsl.la					\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(top_builddir)/src/util/libmesautil.la		\
-	$(PTHREAD_LIBS)
-
-glsl_test_SOURCES = \
-	standalone_scaffolding.cpp \
-	test.cpp \
-	test_optpass.cpp \
-	test_optpass.h
-
-glsl_test_LDADD =					\
-	libglsl.la					\
-	$(top_builddir)/src/libglsl_util.la		\
-	$(PTHREAD_LIBS)
-
-# We write our own rules for yacc and lex below. We'd rather use automake,
-# but automake makes it especially difficult for a number of reasons:
-#
-#  * < automake-1.12 generates .h files from .yy and .ypp files, but
-#    >=automake-1.12 generates .hh and .hpp files respectively. There's no
-#    good way of making a project that uses C++ yacc files compatible with
-#    both versions of automake. Strong work automake developers.
-#
-#  * Since we're generating code from .l/.y files in a subdirectory (glcpp/)
-#    we'd like the resulting generated code to also go in glcpp/ for purposes
-#    of distribution. Automake gives no way to do this.
-#
-#  * Since we're building multiple yacc parsers into one library (and via one
-#    Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes
-#    automake to name the resulting generated code as <library-name>_filename.c.
-#    Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file.
-
-# In order to make build output print "LEX" and "YACC", we reproduce the
-# automake variables below.
-
-AM_V_LEX = $(am__v_LEX_$(V))
-am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
-am__v_LEX_0 = @echo "  LEX     " $@;
-am__v_LEX_1 =
-
-AM_V_YACC = $(am__v_YACC_$(V))
-am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
-am__v_YACC_0 = @echo "  YACC    " $@;
-am__v_YACC_1 =
-
-MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
-YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
-LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
-
-glsl_parser.cpp glsl_parser.h: glsl_parser.yy
-	$(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl_parser.h $(srcdir)/glsl_parser.yy
-
-glsl_lexer.cpp: glsl_lexer.ll
-	$(LEX_GEN) -o $@ $(srcdir)/glsl_lexer.ll
-
-glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y
-	$(MKDIR_GEN)
-	$(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glcpp/glcpp-parse.h $(srcdir)/glcpp/glcpp-parse.y
-
-glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-	$(MKDIR_GEN)
-	$(LEX_GEN) -o $@ $(srcdir)/glcpp/glcpp-lex.l
-
-# Only the parsers (specifically the header files generated at the same time)
-# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is
-# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files
-# YACC is only executed once for each parser. The rest of the generated code
-# will be created at the appropriate times according to standard automake
-# dependency rules.
-BUILT_SOURCES =						\
-	glsl_parser.cpp					\
-	glsl_lexer.cpp					\
-	glcpp/glcpp-parse.c				\
-	glcpp/glcpp-lex.c
-CLEANFILES =						\
-	glcpp/glcpp-parse.h				\
-	glsl_parser.h					\
-	$(BUILT_SOURCES)
-
-clean-local:
-	$(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr
-
-dist-hook:
-	$(RM) glcpp/tests/*.out
-	$(RM) glcpp/tests/subtest*/*.out
diff --git a/src/compiler/glsl/Makefile.sources b/src/compiler/glsl/Makefile.sources
deleted file mode 100644
index fadfab8a209..00000000000
--- a/src/compiler/glsl/Makefile.sources
+++ /dev/null
@@ -1,224 +0,0 @@
-# shared source lists for Makefile, SConscript, and Android.mk
-
-# libglcpp
-
-LIBGLCPP_FILES = \
-	glcpp/glcpp.h \
-	glcpp/pp.c
-
-LIBGLCPP_GENERATED_FILES = \
-	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/nir.c \
-	nir/nir.h \
-	nir/nir_array.h \
-	nir/nir_builder.h \
-	nir/nir_clone.c \
-	nir/nir_constant_expressions.h \
-	nir/nir_control_flow.c \
-	nir/nir_control_flow.h \
-	nir/nir_control_flow_private.h \
-	nir/nir_dominance.c \
-	nir/nir_from_ssa.c \
-	nir/nir_gs_count_vertices.c \
-	nir/nir_intrinsics.c \
-	nir/nir_intrinsics.h \
-	nir/nir_instr_set.c \
-	nir/nir_instr_set.h \
-	nir/nir_liveness.c \
-	nir/nir_lower_alu_to_scalar.c \
-	nir/nir_lower_atomics.c \
-	nir/nir_lower_clip.c \
-	nir/nir_lower_double_packing.c \
-	nir/nir_lower_global_vars_to_local.c \
-	nir/nir_lower_gs_intrinsics.c \
-	nir/nir_lower_load_const_to_scalar.c \
-	nir/nir_lower_locals_to_regs.c \
-	nir/nir_lower_idiv.c \
-	nir/nir_lower_io.c \
-	nir/nir_lower_outputs_to_temporaries.c \
-	nir/nir_lower_phis_to_scalar.c \
-	nir/nir_lower_samplers.c \
-	nir/nir_lower_system_values.c \
-	nir/nir_lower_tex.c \
-	nir/nir_lower_to_source_mods.c \
-	nir/nir_lower_two_sided_color.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_move_vec_src_uses_to_dest.c \
-	nir/nir_normalize_cubemap_coords.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_dead_cf.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_opt_undef.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_sweep.c \
-	nir/nir_to_ssa.c \
-	nir/nir_validate.c \
-	nir/nir_vla.h \
-	nir/nir_worklist.c \
-	nir/nir_worklist.h
-
-# libglsl
-
-LIBGLSL_FILES = \
-	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_types.cpp \
-	builtin_variables.cpp \
-	glsl_parser_extras.cpp \
-	glsl_parser_extras.h \
-	glsl_symbol_table.cpp \
-	glsl_symbol_table.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_buffer_access.cpp \
-	lower_buffer_access.h \
-	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_subroutine.cpp \
-	lower_tess_level.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_derefs.cpp \
-	lower_vector_insert.cpp \
-	lower_vertex_id.cpp \
-	lower_output_reads.cpp \
-	lower_shared_reference.cpp \
-	lower_ubo_reference.cpp \
-	opt_algebraic.cpp \
-	opt_array_splitting.cpp \
-	opt_conditional_discard.cpp \
-	opt_constant_folding.cpp \
-	opt_constant_propagation.cpp \
-	opt_constant_variable.cpp \
-	opt_copy_propagation.cpp \
-	opt_copy_propagation_elements.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 \
-	propagate_invariance.cpp \
-	s_expression.cpp \
-	s_expression.h
-
-# glsl to nir pass
-GLSL_TO_NIR_FILES = \
-	nir/glsl_to_nir.cpp \
-	nir/glsl_to_nir.h
-
-# glsl_compiler
-
-GLSL_COMPILER_CXX_FILES = \
-	standalone_scaffolding.cpp \
-	standalone_scaffolding.h \
-	main.cpp
-
-# libglsl generated sources
-LIBGLSL_GENERATED_CXX_FILES = \
-	glsl_lexer.cpp \
-	glsl_parser.cpp
diff --git a/src/compiler/nir/Makefile.sources b/src/compiler/nir/Makefile.sources
deleted file mode 100644
index ae6cddbcf6c..00000000000
--- a/src/compiler/nir/Makefile.sources
+++ /dev/null
@@ -1,79 +0,0 @@
-NIR_GENERATED_FILES = \
-	nir_builder_opcodes.h \
-	nir_constant_expressions.c \
-	nir_opcodes.c \
-	nir_opcodes.h \
-	nir_opt_algebraic.c
-
-NIR_FILES = \
-	glsl_to_nir.cpp \
-	glsl_to_nir.h \
-	nir.c \
-	nir.h \
-	nir_array.h \
-	nir_builder.h \
-	nir_clone.c \
-	nir_constant_expressions.h \
-	nir_control_flow.c \
-	nir_control_flow.h \
-	nir_control_flow_private.h \
-	nir_dominance.c \
-	nir_from_ssa.c \
-	nir_gather_info.c \
-	nir_gs_count_vertices.c \
-	nir_inline_functions.c \
-	nir_instr_set.c \
-	nir_instr_set.h \
-	nir_intrinsics.c \
-	nir_intrinsics.h \
-	nir_liveness.c \
-	nir_lower_alu_to_scalar.c \
-	nir_lower_atomics.c \
-	nir_lower_clip.c \
-	nir_lower_double_packing.c \
-	nir_lower_global_vars_to_local.c \
-	nir_lower_gs_intrinsics.c \
-	nir_lower_load_const_to_scalar.c \
-	nir_lower_locals_to_regs.c \
-	nir_lower_idiv.c \
-	nir_lower_indirect_derefs.c \
-	nir_lower_io.c \
-	nir_lower_outputs_to_temporaries.c \
-	nir_lower_phis_to_scalar.c \
-	nir_lower_returns.c \
-	nir_lower_samplers.c \
-	nir_lower_system_values.c \
-	nir_lower_tex.c \
-	nir_lower_to_source_mods.c \
-	nir_lower_two_sided_color.c \
-	nir_lower_vars_to_ssa.c \
-	nir_lower_var_copies.c \
-	nir_lower_vec_to_movs.c \
-	nir_metadata.c \
-	nir_move_vec_src_uses_to_dest.c \
-	nir_normalize_cubemap_coords.c \
-	nir_opt_constant_folding.c \
-	nir_opt_copy_propagate.c \
-	nir_opt_cse.c \
-	nir_opt_dce.c \
-	nir_opt_dead_cf.c \
-	nir_opt_gcm.c \
-	nir_opt_global_to_local.c \
-	nir_opt_peephole_select.c \
-	nir_opt_remove_phis.c \
-	nir_opt_undef.c \
-	nir_phi_builder.c \
-	nir_phi_builder.h \
-	nir_print.c \
-	nir_remove_dead_variables.c \
-	nir_repair_ssa.c \
-	nir_search.c \
-	nir_search.h \
-	nir_split_var_copies.c \
-	nir_sweep.c \
-	nir_to_ssa.c \
-	nir_validate.c \
-	nir_vla.h \
-	nir_worklist.c \
-	nir_worklist.h
-