glsl: move to compiler/

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>

configure.ac

@@ -2506,7 +2506,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/winsys/virgl/vtest/Makefile
 		src/gbm/Makefile
 		src/gbm/main/gbm.pc
-		src/glsl/Makefile
 		src/glx/Makefile
 		src/glx/apple/Makefile
 		src/glx/tests/Makefile

src/Makefile.am

@@ -25,7 +25,7 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi
 SUBDIRS += compiler
 
 if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+SUBDIRS += mesa
 endif
 
 SUBDIRS += loader

src/SConscript

@@ -6,7 +6,6 @@ if env['platform'] == 'windows':
 
 SConscript('util/SConscript')
 SConscript('compiler/SConscript')
-SConscript('glsl/SConscript')
 
 if env['hostonly']:
     # We are just compiling the things necessary on the host for cross

src/compiler/Makefile.am

@@ -1,4 +1,5 @@
 #
+# Copyright © 2012 Jon TURNEY
 # Copyright (C) 2015 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,6 +28,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa/ \
+	-I$(top_builddir)/src/compiler/glsl\
+	-I$(top_srcdir)/src/compiler/glsl\
+	-I$(top_srcdir)/src/compiler/glsl/glcpp\
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gtest/include \
@@ -51,6 +55,201 @@ CLEANFILES =
 EXTRA_DIST = SConscript
 
 
+EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README	\
+	glsl/TODO glsl/glcpp/README			\
+	glsl/glsl_lexer.ll				\
+	glsl/glsl_parser.yy				\
+	glsl/glcpp/glcpp-lex.l				\
+	glsl/glcpp/glcpp-parse.y			\
+	glsl/Makefile.sources				\
+	glsl/SConscript
+
+TESTS += glsl/glcpp/tests/glcpp-test			\
+	glsl/glcpp/tests/glcpp-test-cr-lf		\
+	glsl/tests/blob-test				\
+	glsl/tests/general-ir-test			\
+	glsl/tests/optimization-test			\
+	glsl/tests/sampler-types-test			\
+	glsl/tests/uniform-initializer-test
+
+TESTS_ENVIRONMENT= \
+	export PYTHON2=$(PYTHON2); \
+	export PYTHON_FLAGS=$(PYTHON_FLAGS);
+
+check_PROGRAMS +=					\
+	glsl/glcpp/glcpp				\
+	glsl/glsl_test					\
+	glsl/tests/blob-test				\
+	glsl/tests/general-ir-test			\
+	glsl/tests/sampler-types-test			\
+	glsl/tests/uniform-initializer-test
+
+noinst_PROGRAMS = glsl_compiler
+
+glsl_tests_blob_test_SOURCES =				\
+	glsl/tests/blob_test.c
+glsl_tests_blob_test_LDADD =				\
+	glsl/libglsl.la
+
+glsl_tests_general_ir_test_SOURCES =			\
+	glsl/standalone_scaffolding.cpp			\
+	glsl/tests/builtin_variable_test.cpp		\
+	glsl/tests/invalidate_locations_test.cpp	\
+	glsl/tests/general_ir_test.cpp			\
+	glsl/tests/varyings_test.cpp
+glsl_tests_general_ir_test_CFLAGS =			\
+	$(PTHREAD_CFLAGS)
+glsl_tests_general_ir_test_LDADD =			\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	glsl/libglsl.la		\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(PTHREAD_LIBS)
+
+glsl_tests_uniform_initializer_test_SOURCES =		\
+	glsl/tests/copy_constant_to_storage_tests.cpp	\
+	glsl/tests/set_uniform_initializer_tests.cpp	\
+	glsl/tests/uniform_initializer_utils.cpp	\
+	glsl/tests/uniform_initializer_utils.h
+glsl_tests_uniform_initializer_test_CFLAGS =		\
+	$(PTHREAD_CFLAGS)
+glsl_tests_uniform_initializer_test_LDADD =		\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	glsl/libglsl.la		\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(PTHREAD_LIBS)
+
+glsl_tests_sampler_types_test_SOURCES =			\
+	glsl/tests/sampler_types_test.cpp
+glsl_tests_sampler_types_test_CFLAGS =			\
+	$(PTHREAD_CFLAGS)
+glsl_tests_sampler_types_test_LDADD =			\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	glsl/libglsl.la					\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(PTHREAD_LIBS)
+
+noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la
+
+glsl_libglcpp_la_LIBADD =				\
+	$(top_builddir)/src/util/libmesautil.la
+glsl_libglcpp_la_SOURCES =				\
+	glsl/glcpp/glcpp-lex.c				\
+	glsl/glcpp/glcpp-parse.c			\
+	glsl/glcpp/glcpp-parse.h			\
+	$(LIBGLCPP_FILES)
+
+glsl_glcpp_glcpp_SOURCES =				\
+	glsl/glcpp/glcpp.c
+glsl_glcpp_glcpp_LDADD =				\
+	glsl/libglcpp.la	\
+	$(top_builddir)/src/libglsl_util.la		\
+	-lm
+
+glsl_libglsl_la_LIBADD = \
+	nir/libnir.la \
+	glsl/libglcpp.la
+
+glsl_libglsl_la_SOURCES =				\
+	glsl/glsl_lexer.cpp				\
+	glsl/glsl_parser.cpp				\
+	glsl/glsl_parser.h				\
+	$(LIBGLSL_FILES)
+
+
+glsl_compiler_SOURCES = \
+	$(GLSL_COMPILER_CXX_FILES)
+
+glsl_compiler_LDADD =					\
+	glsl/libglsl.la					\
+	$(top_builddir)/src/libglsl_util.la		\
+	$(top_builddir)/src/util/libmesautil.la		\
+	$(PTHREAD_LIBS)
+
+glsl_glsl_test_SOURCES = \
+	glsl/standalone_scaffolding.cpp \
+	glsl/test.cpp \
+	glsl/test_optpass.cpp \
+	glsl/test_optpass.h
+
+glsl_glsl_test_LDADD =					\
+	glsl/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/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
+	$(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy
+
+glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll
+	$(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll
+
+glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y
+	$(MKDIR_GEN)
+	$(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y
+
+glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l
+	$(MKDIR_GEN)
+	$(LEX_GEN) -o $@ $(srcdir)/glsl/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/glsl_parser.cpp				\
+	glsl/glsl_lexer.cpp				\
+	glsl/glcpp/glcpp-parse.c			\
+	glsl/glcpp/glcpp-lex.c
+CLEANFILES +=						\
+	glsl/glcpp/glcpp-parse.h			\
+	glsl/glsl_parser.h				\
+	glsl/glsl_parser.cpp				\
+	glsl/glsl_lexer.cpp				\
+	glsl/glcpp/glcpp-parse.c			\
+	glsl/glcpp/glcpp-lex.c
+
+clean-local:
+	$(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr
+
+dist-hook:
+	$(RM) glsl/glcpp/tests/*.out
+	$(RM) glsl/glcpp/tests/subtest*/*.out
+
 noinst_LTLIBRARIES += nir/libnir.la
 
 nir_libnir_la_CPPFLAGS = \
@@ -101,7 +300,7 @@ nir_tests_control_flow_tests_CFLAGS =			\
 	$(PTHREAD_CFLAGS)
 nir_tests_control_flow_tests_LDADD =			\
 	$(top_builddir)/src/gtest/libgtest.la		\
-	$(top_builddir)/src/compiler/nir/libnir.la	\
+	nir/libnir.la	\
 	$(top_builddir)/src/util/libmesautil.la		\
 	$(PTHREAD_LIBS)
 

src/compiler/Makefile.sources

@@ -7,6 +7,153 @@ LIBCOMPILER_FILES = \
 	shader_enums.c \
 	shader_enums.h
 
+# libglsl
+
+LIBGLSL_FILES = \
+	glsl/ast.h \
+	glsl/ast_array_index.cpp \
+	glsl/ast_expr.cpp \
+	glsl/ast_function.cpp \
+	glsl/ast_to_hir.cpp \
+	glsl/ast_type.cpp \
+	glsl/blob.c \
+	glsl/blob.h \
+	glsl/builtin_functions.cpp \
+	glsl/builtin_types.cpp \
+	glsl/builtin_variables.cpp \
+	glsl/glsl_parser_extras.cpp \
+	glsl/glsl_parser_extras.h \
+	glsl/glsl_symbol_table.cpp \
+	glsl/glsl_symbol_table.h \
+	glsl/hir_field_selection.cpp \
+	glsl/ir_basic_block.cpp \
+	glsl/ir_basic_block.h \
+	glsl/ir_builder.cpp \
+	glsl/ir_builder.h \
+	glsl/ir_clone.cpp \
+	glsl/ir_constant_expression.cpp \
+	glsl/ir.cpp \
+	glsl/ir.h \
+	glsl/ir_equals.cpp \
+	glsl/ir_expression_flattening.cpp \
+	glsl/ir_expression_flattening.h \
+	glsl/ir_function_can_inline.cpp \
+	glsl/ir_function_detect_recursion.cpp \
+	glsl/ir_function_inlining.h \
+	glsl/ir_function.cpp \
+	glsl/ir_hierarchical_visitor.cpp \
+	glsl/ir_hierarchical_visitor.h \
+	glsl/ir_hv_accept.cpp \
+	glsl/ir_import_prototypes.cpp \
+	glsl/ir_optimization.h \
+	glsl/ir_print_visitor.cpp \
+	glsl/ir_print_visitor.h \
+	glsl/ir_reader.cpp \
+	glsl/ir_reader.h \
+	glsl/ir_rvalue_visitor.cpp \
+	glsl/ir_rvalue_visitor.h \
+	glsl/ir_set_program_inouts.cpp \
+	glsl/ir_uniform.h \
+	glsl/ir_validate.cpp \
+	glsl/ir_variable_refcount.cpp \
+	glsl/ir_variable_refcount.h \
+	glsl/ir_visitor.h \
+	glsl/linker.cpp \
+	glsl/linker.h \
+	glsl/link_atomics.cpp \
+	glsl/link_functions.cpp \
+	glsl/link_interface_blocks.cpp \
+	glsl/link_uniforms.cpp \
+	glsl/link_uniform_initializers.cpp \
+	glsl/link_uniform_block_active_visitor.cpp \
+	glsl/link_uniform_block_active_visitor.h \
+	glsl/link_uniform_blocks.cpp \
+	glsl/link_varyings.cpp \
+	glsl/link_varyings.h \
+	glsl/list.h \
+	glsl/loop_analysis.cpp \
+	glsl/loop_analysis.h \
+	glsl/loop_controls.cpp \
+	glsl/loop_unroll.cpp \
+	glsl/lower_buffer_access.cpp \
+	glsl/lower_buffer_access.h \
+	glsl/lower_clip_distance.cpp \
+	glsl/lower_const_arrays_to_uniforms.cpp \
+	glsl/lower_discard.cpp \
+	glsl/lower_discard_flow.cpp \
+	glsl/lower_if_to_cond_assign.cpp \
+	glsl/lower_instructions.cpp \
+	glsl/lower_jumps.cpp \
+	glsl/lower_mat_op_to_vec.cpp \
+	glsl/lower_noise.cpp \
+	glsl/lower_offset_array.cpp \
+	glsl/lower_packed_varyings.cpp \
+	glsl/lower_named_interface_blocks.cpp \
+	glsl/lower_packing_builtins.cpp \
+	glsl/lower_subroutine.cpp \
+	glsl/lower_tess_level.cpp \
+	glsl/lower_texture_projection.cpp \
+	glsl/lower_variable_index_to_cond_assign.cpp \
+	glsl/lower_vec_index_to_cond_assign.cpp \
+	glsl/lower_vec_index_to_swizzle.cpp \
+	glsl/lower_vector.cpp \
+	glsl/lower_vector_derefs.cpp \
+	glsl/lower_vector_insert.cpp \
+	glsl/lower_vertex_id.cpp \
+	glsl/lower_output_reads.cpp \
+	glsl/lower_shared_reference.cpp \
+	glsl/lower_ubo_reference.cpp \
+	glsl/opt_algebraic.cpp \
+	glsl/opt_array_splitting.cpp \
+	glsl/opt_conditional_discard.cpp \
+	glsl/opt_constant_folding.cpp \
+	glsl/opt_constant_propagation.cpp \
+	glsl/opt_constant_variable.cpp \
+	glsl/opt_copy_propagation.cpp \
+	glsl/opt_copy_propagation_elements.cpp \
+	glsl/opt_dead_builtin_variables.cpp \
+	glsl/opt_dead_builtin_varyings.cpp \
+	glsl/opt_dead_code.cpp \
+	glsl/opt_dead_code_local.cpp \
+	glsl/opt_dead_functions.cpp \
+	glsl/opt_flatten_nested_if_blocks.cpp \
+	glsl/opt_flip_matrices.cpp \
+	glsl/opt_function_inlining.cpp \
+	glsl/opt_if_simplification.cpp \
+	glsl/opt_minmax.cpp \
+	glsl/opt_noop_swizzle.cpp \
+	glsl/opt_rebalance_tree.cpp \
+	glsl/opt_redundant_jumps.cpp \
+	glsl/opt_structure_splitting.cpp \
+	glsl/opt_swizzle_swizzle.cpp \
+	glsl/opt_tree_grafting.cpp \
+	glsl/opt_vectorize.cpp \
+	glsl/program.h \
+	glsl/s_expression.cpp \
+	glsl/s_expression.h
+
+# glsl_compiler
+
+GLSL_COMPILER_CXX_FILES = \
+	glsl/standalone_scaffolding.cpp \
+	glsl/standalone_scaffolding.h \
+	glsl/main.cpp
+
+# libglsl generated sources
+LIBGLSL_GENERATED_CXX_FILES = \
+	glsl/glsl_lexer.cpp \
+	glsl/glsl_parser.cpp
+
+# libglcpp
+
+LIBGLCPP_FILES = \
+	glsl/glcpp/glcpp.h \
+	glsl/glcpp/pp.c
+
+LIBGLCPP_GENERATED_FILES = \
+	glsl/glcpp/glcpp-lex.c \
+	glsl/glcpp/glcpp-parse.c
+
 NIR_GENERATED_FILES = \
 	nir/nir_builder_opcodes.h \
 	nir/nir_constant_expressions.c \

src/compiler/SConscript

@@ -20,3 +20,5 @@ compiler = env.ConvenienceLibrary(
     source = sources
 )
 Export('compiler')
+
+SConscript('glsl/SConscript')