diff options
Diffstat (limited to 'src/angle/src/compiler')
-rw-r--r-- | src/angle/src/compiler/preprocessor/preprocessor.pro | 52 | ||||
-rw-r--r-- | src/angle/src/compiler/translator_common.pro | 24 | ||||
-rw-r--r-- | src/angle/src/compiler/translator_hlsl.pro | 6 |
3 files changed, 34 insertions, 48 deletions
diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index 62476008b3..432c8dcf32 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/src/angle/src/compiler/preprocessor/preprocessor.pro @@ -4,43 +4,43 @@ TARGET = $$qtLibraryTarget(preprocessor) include(../../config.pri) -INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor/new +INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor DEFINES += _SECURE_SCL=0 FLEX_SOURCES = \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Tokenizer.l + $$ANGLE_DIR/src/compiler/preprocessor/Tokenizer.l BISON_SOURCES = \ - $$ANGLE_DIR/src/compiler/preprocessor/new/ExpressionParser.y + $$ANGLE_DIR/src/compiler/preprocessor/ExpressionParser.y HEADERS += \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Diagnostics.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/DirectiveHandler.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/DirectiveParser.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/ExpressionParser.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Input.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Lexer.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Macro.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/MacroExpander.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/numeric_lex.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/pp_utils.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Preprocessor.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/SourceLocation.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Token.h \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Tokenizer.h + $$ANGLE_DIR/src/compiler/preprocessor/DiagnosticsBase.h \ + $$ANGLE_DIR/src/compiler/preprocessor/DirectiveHandlerBase.h \ + $$ANGLE_DIR/src/compiler/preprocessor/DirectiveParser.h \ + $$ANGLE_DIR/src/compiler/preprocessor/ExpressionParser.h \ + $$ANGLE_DIR/src/compiler/preprocessor/Input.h \ + $$ANGLE_DIR/src/compiler/preprocessor/Lexer.h \ + $$ANGLE_DIR/src/compiler/preprocessor/Macro.h \ + $$ANGLE_DIR/src/compiler/preprocessor/MacroExpander.h \ + $$ANGLE_DIR/src/compiler/preprocessor/numeric_lex.h \ + $$ANGLE_DIR/src/compiler/preprocessor/pp_utils.h \ + $$ANGLE_DIR/src/compiler/preprocessor/Preprocessor.h \ + $$ANGLE_DIR/src/compiler/preprocessor/SourceLocation.h \ + $$ANGLE_DIR/src/compiler/preprocessor/Token.h \ + $$ANGLE_DIR/src/compiler/preprocessor/Tokenizer.h SOURCES += \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Diagnostics.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/DirectiveHandler.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/DirectiveParser.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Input.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Lexer.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Macro.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/MacroExpander.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Preprocessor.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/new/Token.cpp + $$ANGLE_DIR/src/compiler/preprocessor/DiagnosticsBase.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/DirectiveHandlerBase.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/DirectiveParser.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/Input.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/Lexer.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/Macro.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/MacroExpander.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/Preprocessor.cpp \ + $$ANGLE_DIR/src/compiler/preprocessor/Token.cpp # NOTE: 'win_flex' and 'bison' can be found in qt5/gnuwin32/bin flex.commands = $$addGnuPath(win_flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}.cpp ${QMAKE_FILE_NAME} diff --git a/src/angle/src/compiler/translator_common.pro b/src/angle/src/compiler/translator_common.pro index 2d867a921e..cafbb1595d 100644 --- a/src/angle/src/compiler/translator_common.pro +++ b/src/angle/src/compiler/translator_common.pro @@ -48,22 +48,12 @@ HEADERS += \ $$ANGLE_DIR/src/compiler/ValidateLimitations.h \ $$ANGLE_DIR/src/compiler/VariableInfo.h \ $$ANGLE_DIR/src/compiler/VariablePacker.h \ - $$ANGLE_DIR/src/compiler/preprocessor/atom.h \ - $$ANGLE_DIR/src/compiler/preprocessor/compile.h \ - $$ANGLE_DIR/src/compiler/preprocessor/cpp.h \ - $$ANGLE_DIR/src/compiler/preprocessor/length_limits.h \ - $$ANGLE_DIR/src/compiler/preprocessor/memory.h \ - $$ANGLE_DIR/src/compiler/preprocessor/parser.h \ - $$ANGLE_DIR/src/compiler/preprocessor/preprocess.h \ - $$ANGLE_DIR/src/compiler/preprocessor/scanner.h \ - $$ANGLE_DIR/src/compiler/preprocessor/slglobals.h \ - $$ANGLE_DIR/src/compiler/preprocessor/symbols.h \ - $$ANGLE_DIR/src/compiler/preprocessor/tokens.h \ $$ANGLE_DIR/src/compiler/timing/RestrictFragmentShaderTiming.h \ $$ANGLE_DIR/src/compiler/timing/RestrictVertexShaderTiming.h \ $$ANGLE_DIR/src/compiler/depgraph/DependencyGraph.h \ $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphBuilder.h \ - $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphOutput.h + $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphOutput.h \ + $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.h SOURCES += \ $$ANGLE_DIR/src/compiler/BuiltInFunctionEmulator.cpp \ @@ -93,19 +83,13 @@ SOURCES += \ $$ANGLE_DIR/src/compiler/ValidateLimitations.cpp \ $$ANGLE_DIR/src/compiler/VariableInfo.cpp \ $$ANGLE_DIR/src/compiler/VariablePacker.cpp \ - $$ANGLE_DIR/src/compiler/preprocessor/atom.c \ - $$ANGLE_DIR/src/compiler/preprocessor/cpp.c \ - $$ANGLE_DIR/src/compiler/preprocessor/cppstruct.c \ - $$ANGLE_DIR/src/compiler/preprocessor/memory.c \ - $$ANGLE_DIR/src/compiler/preprocessor/scanner.c \ - $$ANGLE_DIR/src/compiler/preprocessor/symbols.c \ - $$ANGLE_DIR/src/compiler/preprocessor/tokens.c \ $$ANGLE_DIR/src/compiler/depgraph/DependencyGraph.cpp \ $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphBuilder.cpp \ $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphOutput.cpp \ $$ANGLE_DIR/src/compiler/depgraph/DependencyGraphTraverse.cpp \ $$ANGLE_DIR/src/compiler/timing/RestrictFragmentShaderTiming.cpp \ - $$ANGLE_DIR/src/compiler/timing/RestrictVertexShaderTiming.cpp + $$ANGLE_DIR/src/compiler/timing/RestrictVertexShaderTiming.cpp \ + $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.cpp # NOTE: 'win_flex' and 'bison' can be found in qt5/gnuwin32/bin flex.commands = $$addGnuPath(win_flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}_lex.cpp ${QMAKE_FILE_NAME} diff --git a/src/angle/src/compiler/translator_hlsl.pro b/src/angle/src/compiler/translator_hlsl.pro index 048e2a48fd..6b17f14d2e 100644 --- a/src/angle/src/compiler/translator_hlsl.pro +++ b/src/angle/src/compiler/translator_hlsl.pro @@ -14,7 +14,8 @@ HEADERS += \ $$ANGLE_DIR/src/compiler/OutputHLSL.h \ $$ANGLE_DIR/src/compiler/SearchSymbol.h \ $$ANGLE_DIR/src/compiler/TranslatorHLSL.h \ - $$ANGLE_DIR/src/compiler/UnfoldShortCircuit.h + $$ANGLE_DIR/src/compiler/UnfoldShortCircuit.h \ + $$ANGLE_DIR/src/compiler/Uniform.h SOURCES += \ $$ANGLE_DIR/src/compiler/CodeGenHLSL.cpp \ @@ -22,4 +23,5 @@ SOURCES += \ $$ANGLE_DIR/src/compiler/OutputHLSL.cpp \ $$ANGLE_DIR/src/compiler/SearchSymbol.cpp \ $$ANGLE_DIR/src/compiler/TranslatorHLSL.cpp \ - $$ANGLE_DIR/src/compiler/UnfoldShortCircuit.cpp + $$ANGLE_DIR/src/compiler/UnfoldShortCircuit.cpp \ + $$ANGLE_DIR/src/compiler/Uniform.cpp |