diff options
| author | Eric Anholt <[email protected]> | 2010-06-24 15:21:51 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-06-24 15:27:10 -0700 |
| commit | 0ee7d80269bfab14683623b0c8fc12da43db8d78 (patch) | |
| tree | 7b2a65190c9934ed8a0ff02f2845323c420153a3 /Makefile.am | |
| parent | 6b01b50888d22ee330df44240591051cb55cf2a9 (diff) | |
| parent | 8364fc85b8273b4d0f2ecebe7e0085e250d29990 (diff) | |
Merge branch 'mesa'
This brings in the ir_to_mesa.cpp code I've been developing to codegen
to the Mesa IR. It does not actually generate a complete Mesa
fragment/vertex program yet.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a88bf0022ad..c34f7d8abfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,7 @@ # USE OR OTHER DEALINGS IN THE SOFTWARE. AUTOMAKE_OPTIONS = foreign +AM_CPPFLAGS = -I mesa SUBDIRS = glcpp @@ -57,9 +58,15 @@ glsl_SOURCES = \ ir_hierarchical_visitor.h \ ir_hierarchical_visitor.cpp \ ir_swizzle_swizzle.cpp \ + ir_to_mesa.cpp \ + ir_to_mesa.h \ ir_validate.cpp \ ir_vec_index_to_swizzle.cpp \ - linker.cpp + linker.cpp \ + mesa/shader/prog_instruction.c \ + mesa/shader/prog_instruction.h \ + mesa/shader/prog_print.c \ + mesa/shader/prog_print.h BUILT_SOURCES = glsl_parser.h glsl_parser.cpp glsl_lexer.cpp CLEANFILES = $(BUILT_SOURCES) |