X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2FMakefile.am;h=d0e5cd1d05e80636a6648f2c700716617c283cb5;hb=f01f754ca13373d62f5f4ba5ff76d83aa4eac62b;hp=955556b64a37f89afbe2adc9c316bfe1c0e0d2ac;hpb=9947656168d09f9019600fccc42ca8e0de49b83a;p=mesa.git diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index 955556b64a3..d0e5cd1d05e 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -1,6 +1,4 @@ - - -# Copyright © 2012 Matt Turner +# 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"), @@ -21,61 +19,156 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +SUBDIRS = builtin_compiler + +AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/glsl/glcpp \ + -I$(top_srcdir)/src/gtest/include \ + $(DEFINES) \ + $(API_DEFINES) +AM_CFLAGS = $(VISIBILITY_CFLAGS) +AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) + include Makefile.sources -SUBDIRS = glcpp +TESTS = glcpp/tests/glcpp-test \ + tests/optimization-test \ + tests/ralloc-test \ + tests/uniform-initializer-test -noinst_LTLIBRARIES = libglslcore.la -lib_LTLIBRARIES = libglsl.la -check_PROGRAMS = glsl_test -noinst_PROGRAMS = builtin_compiler -bin_PROGRAMS = glsl_compiler +TESTS_ENVIRONMENT= \ + export PYTHON2=$(PYTHON2); \ + export PYTHON_FLAGS=$(PYTHON_FLAGS); -AM_CPPFLAGS = \ - $(DEFINES) \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/mapi \ - -I$(top_srcdir)/include - -BUILT_SOURCES = glsl_parser.h -AM_YFLAGS = -d -p "_mesa_glsl_" -AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c - -libglslcore_la_SOURCES = \ - strtod.c \ - glsl_lexer.ll \ - glsl_parser.yy \ - $(LIBGLSL_CXX_FILES) -libglslcore_la_LIBADD = glcpp/libglcpp.la - -builtin_compiler_SOURCES = \ - builtin_stubs.cpp \ - main.cpp \ - standalone_scaffolding.cpp \ - ../mesa/program/symbol_table.c -builtin_compiler_LDADD = libglslcore.la +noinst_LTLIBRARIES = libglsl.la libglcpp.la +check_PROGRAMS = \ + glcpp/glcpp \ + glsl_test \ + tests/ralloc-test \ + tests/uniform-initializer-test -libglsl_la_SOURCES = builtin_function.cpp -libglsl_la_LIBADD = libglslcore.la -libglsl_la_LDFLAGS = -avoid-version +tests_uniform_initializer_test_SOURCES = \ + $(top_srcdir)/src/mesa/main/hash_table.c \ + $(top_srcdir)/src/mesa/main/imports.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c\ + $(top_srcdir)/src/mesa/program/symbol_table.c \ + tests/copy_constant_to_storage_tests.cpp \ + tests/set_uniform_initializer_tests.cpp \ + tests/uniform_initializer_utils.cpp +tests_uniform_initializer_test_CFLAGS = \ + $(PTHREAD_CFLAGS) +tests_uniform_initializer_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + $(top_builddir)/src/glsl/libglsl.la \ + $(PTHREAD_LIBS) + +tests_ralloc_test_SOURCES = \ + tests/ralloc_test.cpp \ + $(top_builddir)/src/glsl/ralloc.c +tests_ralloc_test_CFLAGS = $(PTHREAD_CFLAGS) +tests_ralloc_test_LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + $(PTHREAD_LIBS) + +if CROSS_COMPILING +libglcpp_la_SOURCES = \ + glcpp/glcpp-lex.c \ + glcpp/glcpp-parse.c \ + $(LIBGLCPP_FILES) +else +libglcpp_la_LIBADD = builtin_compiler/libglcpp.la +endif + +glcpp_glcpp_SOURCES = \ + glcpp/glcpp.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c +glcpp_glcpp_LDADD = libglcpp.la -glsl_compiler_SOURCES = \ - main.cpp \ - standalone_scaffolding.cpp \ - ../mesa/program/symbol_table.c -glsl_compiler_LDADD = libglsl.la +libglsl_la_SOURCES = builtin_function.cpp +libglsl_la_LIBADD = libglcpp.la +if CROSS_COMPILING +libglsl_la_SOURCES += \ + glsl_lexer.cpp \ + glsl_parser.cpp \ + $(LIBGLSL_FILES) +else +libglsl_la_LIBADD += \ + builtin_compiler/libglslcore.la +endif glsl_test_SOURCES = \ + $(top_srcdir)/src/mesa/main/hash_table.c \ + $(top_srcdir)/src/mesa/main/imports.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c \ + $(top_srcdir)/src/mesa/program/symbol_table.c \ + $(GLSL_SRCDIR)/standalone_scaffolding.cpp \ test.cpp \ - test_optpass.cpp \ - standalone_scaffolding.cpp \ - ../mesa/program/symbol_table.c + test_optpass.cpp + glsl_test_LDADD = libglsl.la -builtin_function.cpp: builtin_compiler - $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/glsl/builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp +# 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 _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. -if BUILD_SHARED -all-local: libglsl.la - ln -f .libs/libglsl.so $(top_builddir)/$(LIB_DIR)/libglsl.so; -endif +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 = + +glsl_parser.cpp glsl_parser.h: glsl_parser.yy + $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "_mesa_glsl_" --defines=$(GLSL_BUILDDIR)/glsl_parser.h $< + +glsl_lexer.cpp: glsl_lexer.ll + $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $< + +glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y + $(MKDIR_P) $(GLSL_BUILDDIR)/glcpp + $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(GLSL_BUILDDIR)/glcpp/glcpp-parse.h $< + +glcpp/glcpp-lex.c: glcpp/glcpp-lex.l + $(MKDIR_P) $(GLSL_BUILDDIR)/glcpp + $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $< + +# 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) + +builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py $(builddir)/builtin_compiler/builtin_compiler$(BUILD_EXEEXT) + $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py $(builddir)/builtin_compiler/builtin_compiler$(BUILD_EXEEXT) > builtin_function.cpp || rm -f builtin_function.cpp