From ee3cdac7857a5c0f30108e1b1963d042f2a5e8e6 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 12 Jul 2016 16:42:36 -0700 Subject: glsl: Use the generated constant expression code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Immediately previous to this patch, diff -wud src/glsl/ir_constant_expression.cpp \ src/glsl/ir_expression_operation_constant.h should be "minimal." v3: With much help from José Fonseca, fix the SCons build. Signed-off-by: Ian Romanick Reviewed-by: Matt Turner --- src/compiler/Makefile.glsl.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/compiler/Makefile.glsl.am') diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index 125580d..b8225cb 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -201,6 +201,10 @@ glsl/ir_expression_operation.h: glsl/ir_expression_operation.py $(MKDIR_GEN) $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py enum > $@ || ($(RM) $@; false) +glsl/ir_expression_operation_constant.h: glsl/ir_expression_operation.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py constant > $@ || ($(RM) $@; false) + glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py $(MKDIR_GEN) $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false) @@ -215,6 +219,7 @@ BUILT_SOURCES += \ glsl/glsl_parser.cpp \ glsl/glsl_lexer.cpp \ glsl/ir_expression_operation.h \ + glsl/ir_expression_operation_constant.h \ glsl/ir_expression_operation_strings.h \ glsl/glcpp/glcpp-parse.c \ glsl/glcpp/glcpp-lex.c @@ -224,6 +229,7 @@ CLEANFILES += \ glsl/glsl_parser.cpp \ glsl/glsl_lexer.cpp \ glsl/ir_expression_operation.h \ + glsl/ir_expression_operation_constant.h \ glsl/ir_expression_operation_strings.h \ glsl/glcpp/glcpp-parse.c \ glsl/glcpp/glcpp-lex.c -- cgit v1.1