From e0439f750557bc6880a8a4eccb38256fafd63fae Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 21 Aug 2014 12:38:05 -0700 Subject: mesa: Autogenerate most of format_pack.c We were auto-generating it before. The problem was that the autogeneration tool we were using was called "copy, paste, and edit". Let's use a more sensible solution. Signed-off-by: Jason Ekstrand v2 by Samuel Iglesias - Remove format_pack.c as it is now autogenerated - Add usage of INDENT_FLAGS in Makefile.am - Remove trailing blank line v3 by Samuel Iglesias - Merge format_convert.py into format_parser.py - Adapt pack_*_* function generations - Fix out-of-tree build v4 by Samuel Iglesias - _get_datatype() is now a helper function v5 by Samuel Iglesias - format_pack.c.mako is now format_pack.py, with the template code inlined. It now auto-generates format_pack.c - Simplify Makefile.am change. - Modify SConscript to build format_pack.c with scons. - Remove run_mako.py - Add format_pack.c to gitignore v6 by Samuel Iglesias : - Don't allow float to non-normalized integer format conversions. - Add non-normalized formats support for ubyte packing functions. Merge the previously separated patch. - Add clamping for non-normalized integer formats in pack_ubyte*() v7 by Samuel Iglesias : - Add assert to check that sRGB formats are 8-bit size. Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Jason Ekstrand --- src/mesa/Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/mesa/Makefile.am') diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 8d8082ae36a..6b00310032f 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -83,6 +83,7 @@ BUILT_SOURCES = \ main/get_hash.h \ main/format_info.c \ $(BUILDDIR)main/git_sha1.h \ + main/format_pack.c \ $(BUILDDIR)program/program_parse.tab.c \ $(BUILDDIR)program/lex.yy.c CLEANFILES = \ @@ -106,6 +107,14 @@ main/format_info.c: main/formats.csv \ $< > $@.tmp; \ mv $@.tmp $@; +main/format_pack.c: main/format_pack.py main/formats.csv \ + main/format_parser.py + $(AM_V_GEN)set -e; \ + $(PYTHON2) $(PYTHON_FLAGS) \ + $(srcdir)/main/format_pack.py \ + $(srcdir)/main/formats.csv \ + | $(INDENT) $(INDENT_FLAGS) > $@; + main/formats.c: main/format_info.c noinst_LTLIBRARIES = $(ARCH_LIBS) -- cgit v1.2.3