diff options
Diffstat (limited to 'src/angle/src/compiler')
-rw-r--r-- | src/angle/src/compiler/preprocessor/preprocessor.pro | 7 | ||||
-rw-r--r-- | src/angle/src/compiler/translator.pro | 87 |
2 files changed, 55 insertions, 39 deletions
diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro index 9d0728a72d..66bc59a5ff 100644 --- a/src/angle/src/compiler/preprocessor/preprocessor.pro +++ b/src/angle/src/compiler/preprocessor/preprocessor.pro @@ -3,7 +3,10 @@ include($$OUT_PWD/../../../../gui/qtgui-config.pri) qtConfig(dynamicgl): CONFIG += not_installed include(../../config.pri) -INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor +INCLUDEPATH = \ + $$ANGLE_DIR/src \ + $$ANGLE_DIR/src/common/third_party/base \ + $$ANGLE_DIR/src/compiler/preprocessor DEFINES += _SECURE_SCL=0 @@ -20,12 +23,10 @@ HEADERS += \ $$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/length_limits.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 \ diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro index 398b9230cc..c1bf73bdc6 100644 --- a/src/angle/src/compiler/translator.pro +++ b/src/angle/src/compiler/translator.pro @@ -5,7 +5,8 @@ include(../config.pri) INCLUDEPATH += \ $$ANGLE_DIR/src \ - $$ANGLE_DIR/include + $$ANGLE_DIR/include \ + $$ANGLE_DIR/src/common/third_party/base DEFINES += _SECURE_SCL=0 _LIB ANGLE_TRANSLATOR_IMPLEMENTATION ANGLE_TRANSLATOR_STATIC ANGLE_ENABLE_HLSL @@ -13,11 +14,9 @@ FLEX_SOURCES = $$ANGLE_DIR/src/compiler/translator/glslang.l BISON_SOURCES = $$ANGLE_DIR/src/compiler/translator/glslang.y HEADERS += \ - $$ANGLE_DIR/include/GLSLANG/ResourceLimits.h \ $$ANGLE_DIR/include/GLSLANG/ShaderLang.h \ $$ANGLE_DIR/include/GLSLANG/ShaderVars.h \ $$ANGLE_DIR/src/common/angleutils.h \ - $$ANGLE_DIR/src/common/blocklayout.h \ $$ANGLE_DIR/src/common/debug.h \ $$ANGLE_DIR/src/common/platform.h \ $$ANGLE_DIR/src/common/tls.h \ @@ -35,27 +34,18 @@ HEADERS += \ $$ANGLE_DIR/src/compiler/translator/Common.h \ $$ANGLE_DIR/src/compiler/translator/Compiler.h \ $$ANGLE_DIR/src/compiler/translator/ConstantUnion.h \ - $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphBuilder.h \ - $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraph.h \ - $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphOutput.h \ $$ANGLE_DIR/src/compiler/translator/Diagnostics.h \ $$ANGLE_DIR/src/compiler/translator/DirectiveHandler.h \ $$ANGLE_DIR/src/compiler/translator/ExtensionBehavior.h \ $$ANGLE_DIR/src/compiler/translator/EmulatePrecision.h \ $$ANGLE_DIR/src/compiler/translator/FlagStd140Structs.h \ - $$ANGLE_DIR/src/compiler/translator/ForLoopUnroll.h \ $$ANGLE_DIR/src/compiler/translator/HashNames.h \ $$ANGLE_DIR/src/compiler/translator/InfoSink.h \ $$ANGLE_DIR/src/compiler/translator/InitializeDll.h \ $$ANGLE_DIR/src/compiler/translator/Initialize.h \ - $$ANGLE_DIR/src/compiler/translator/InitializeParseContext.h \ $$ANGLE_DIR/src/compiler/translator/InitializeVariables.h \ - $$ANGLE_DIR/src/compiler/translator/intermediate.h \ $$ANGLE_DIR/src/compiler/translator/IntermNode.h \ - $$ANGLE_DIR/src/compiler/translator/LoopInfo.h \ - $$ANGLE_DIR/src/compiler/translator/MMap.h \ $$ANGLE_DIR/src/compiler/translator/NodeSearch.h \ - $$ANGLE_DIR/src/compiler/translator/osinclude.h \ $$ANGLE_DIR/src/compiler/translator/Operator.h \ $$ANGLE_DIR/src/compiler/translator/OutputESSL.h \ $$ANGLE_DIR/src/compiler/translator/OutputGLSLBase.h \ @@ -63,25 +53,20 @@ HEADERS += \ $$ANGLE_DIR/src/compiler/translator/OutputHLSL.h \ $$ANGLE_DIR/src/compiler/translator/ParseContext.h \ $$ANGLE_DIR/src/compiler/translator/PoolAlloc.h \ - $$ANGLE_DIR/src/compiler/translator/PruneEmptyDeclarations.h \ $$ANGLE_DIR/src/compiler/translator/Pragma.h \ $$ANGLE_DIR/src/compiler/translator/RegenerateStructNames.h \ $$ANGLE_DIR/src/compiler/translator/RemovePow.h \ $$ANGLE_DIR/src/compiler/translator/RemoveDynamicIndexing.h \ $$ANGLE_DIR/src/compiler/translator/RemoveSwitchFallThrough.h \ - $$ANGLE_DIR/src/compiler/translator/RenameFunction.h \ $$ANGLE_DIR/src/compiler/translator/RewriteDoWhile.h \ $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.h \ $$ANGLE_DIR/src/compiler/translator/SeparateArrayInitialization.h \ $$ANGLE_DIR/src/compiler/translator/SeparateDeclarations.h \ $$ANGLE_DIR/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.h \ $$ANGLE_DIR/src/compiler/translator/SearchSymbol.h \ - $$ANGLE_DIR/src/compiler/translator/ShHandle.h \ $$ANGLE_DIR/src/compiler/translator/SeparateExpressionsReturningArrays.h \ $$ANGLE_DIR/src/compiler/translator/StructureHLSL.h \ $$ANGLE_DIR/src/compiler/translator/SymbolTable.h \ - $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.h \ - $$ANGLE_DIR/src/compiler/translator/timing/RestrictVertexShaderTiming.h \ $$ANGLE_DIR/src/compiler/translator/TranslatorESSL.h \ $$ANGLE_DIR/src/compiler/translator/TranslatorGLSL.h \ $$ANGLE_DIR/src/compiler/translator/TranslatorHLSL.h \ @@ -95,7 +80,6 @@ HEADERS += \ $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.h \ $$ANGLE_DIR/src/compiler/translator/ValidateOutputs.h \ $$ANGLE_DIR/src/compiler/translator/ValidateSwitch.h \ - $$ANGLE_DIR/src/compiler/translator/VariableInfo.h \ $$ANGLE_DIR/src/compiler/translator/VariablePacker.h \ $$ANGLE_DIR/src/compiler/translator/VersionGLSL.h \ $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.h @@ -104,77 +88,108 @@ HEADERS += \ SOURCES += \ $$ANGLE_DIR/src/common/debug.cpp \ $$ANGLE_DIR/src/common/tls.cpp \ + $$ANGLE_DIR/src/compiler/translator/AddAndTrueToLoopCondition.cpp \ + $$ANGLE_DIR/src/compiler/translator/AddDefaultReturnStatements.cpp \ $$ANGLE_DIR/src/compiler/translator/ArrayReturnValueToOutParameter.cpp \ $$ANGLE_DIR/src/compiler/translator/ASTMetadataHLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/blocklayout.cpp \ $$ANGLE_DIR/src/compiler/translator/blocklayoutHLSL.cpp \ + $$ANGLE_DIR/src/compiler/translator/BreakVariableAliasingInInnerLoops.cpp \ $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulator.cpp \ $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/Cache.cpp \ $$ANGLE_DIR/src/compiler/translator/CallDAG.cpp \ + $$ANGLE_DIR/src/compiler/translator/ClampPointSize.cpp \ $$ANGLE_DIR/src/compiler/translator/CodeGen.cpp \ + $$ANGLE_DIR/src/compiler/translator/CollectVariables.cpp \ $$ANGLE_DIR/src/compiler/translator/Compiler.cpp \ - $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraph.cpp \ - $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphBuilder.cpp \ - $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphOutput.cpp \ - $$ANGLE_DIR/src/compiler/translator/depgraph/DependencyGraphTraverse.cpp \ + $$ANGLE_DIR/src/compiler/translator/ConstantUnion.cpp \ + $$ANGLE_DIR/src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp \ + $$ANGLE_DIR/src/compiler/translator/DeferGlobalInitializers.cpp \ $$ANGLE_DIR/src/compiler/translator/Diagnostics.cpp \ $$ANGLE_DIR/src/compiler/translator/DirectiveHandler.cpp \ + $$ANGLE_DIR/src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp \ + $$ANGLE_DIR/src/compiler/translator/EmulateGLFragColorBroadcast.cpp \ $$ANGLE_DIR/src/compiler/translator/EmulatePrecision.cpp \ + $$ANGLE_DIR/src/compiler/translator/ExpandIntegerPowExpressions.cpp \ + $$ANGLE_DIR/src/compiler/translator/ExtensionBehavior.cpp \ + $$ANGLE_DIR/src/compiler/translator/ExtensionGLSL.cpp \ + $$ANGLE_DIR/src/compiler/translator/FindMain.cpp \ + $$ANGLE_DIR/src/compiler/translator/FindSymbolNode.cpp \ $$ANGLE_DIR/src/compiler/translator/FlagStd140Structs.cpp \ - $$ANGLE_DIR/src/compiler/translator/ForLoopUnroll.cpp \ + $$ANGLE_DIR/src/compiler/translator/HashNames.cpp \ + $$ANGLE_DIR/src/compiler/translator/ImageFunctionHLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/InfoSink.cpp \ $$ANGLE_DIR/src/compiler/translator/Initialize.cpp \ $$ANGLE_DIR/src/compiler/translator/InitializeDll.cpp \ - $$ANGLE_DIR/src/compiler/translator/InitializeParseContext.cpp \ $$ANGLE_DIR/src/compiler/translator/InitializeVariables.cpp \ - $$ANGLE_DIR/src/compiler/translator/Intermediate.cpp \ $$ANGLE_DIR/src/compiler/translator/IntermNode.cpp \ - $$ANGLE_DIR/src/compiler/translator/intermOut.cpp \ + $$ANGLE_DIR/src/compiler/translator/IntermNodePatternMatcher.cpp \ + $$ANGLE_DIR/src/compiler/translator/IntermNode_util.cpp \ $$ANGLE_DIR/src/compiler/translator/IntermTraverse.cpp \ - $$ANGLE_DIR/src/compiler/translator/LoopInfo.cpp \ + $$ANGLE_DIR/src/compiler/translator/IsASTDepthBelowLimit.cpp \ $$ANGLE_DIR/src/compiler/translator/Operator.cpp \ $$ANGLE_DIR/src/compiler/translator/OutputESSL.cpp \ $$ANGLE_DIR/src/compiler/translator/OutputGLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/OutputGLSLBase.cpp \ $$ANGLE_DIR/src/compiler/translator/OutputHLSL.cpp \ + $$ANGLE_DIR/src/compiler/translator/OutputTree.cpp \ + $$ANGLE_DIR/src/compiler/translator/OutputVulkanGLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/ParseContext.cpp \ $$ANGLE_DIR/src/compiler/translator/PoolAlloc.cpp \ - $$ANGLE_DIR/src/compiler/translator/PruneEmptyDeclarations.cpp \ + $$ANGLE_DIR/src/compiler/translator/PruneNoOps.cpp \ + $$ANGLE_DIR/src/compiler/translator/QualifierTypes.cpp \ + $$ANGLE_DIR/src/compiler/translator/RecordConstantPrecision.cpp \ $$ANGLE_DIR/src/compiler/translator/RegenerateStructNames.cpp \ - $$ANGLE_DIR/src/compiler/translator/RemovePow.cpp \ + $$ANGLE_DIR/src/compiler/translator/RemoveArrayLengthMethod.cpp \ $$ANGLE_DIR/src/compiler/translator/RemoveDynamicIndexing.cpp \ + $$ANGLE_DIR/src/compiler/translator/RemoveEmptySwitchStatements.cpp \ + $$ANGLE_DIR/src/compiler/translator/RemoveInvariantDeclaration.cpp \ + $$ANGLE_DIR/src/compiler/translator/RemoveNoOpCasesFromEndOfSwitchStatements.cpp \ + $$ANGLE_DIR/src/compiler/translator/RemovePow.cpp \ $$ANGLE_DIR/src/compiler/translator/RemoveSwitchFallThrough.cpp \ + $$ANGLE_DIR/src/compiler/translator/RemoveUnreferencedVariables.cpp \ $$ANGLE_DIR/src/compiler/translator/RewriteDoWhile.cpp \ $$ANGLE_DIR/src/compiler/translator/RewriteElseBlocks.cpp \ - $$ANGLE_DIR/src/compiler/translator/SeparateArrayInitialization.cpp \ - $$ANGLE_DIR/src/compiler/translator/SeparateDeclarations.cpp \ + $$ANGLE_DIR/src/compiler/translator/RewriteTexelFetchOffset.cpp \ + $$ANGLE_DIR/src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp \ + $$ANGLE_DIR/src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp \ + $$ANGLE_DIR/src/compiler/translator/RunAtTheEndOfShader.cpp \ $$ANGLE_DIR/src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp \ $$ANGLE_DIR/src/compiler/translator/SearchSymbol.cpp \ + $$ANGLE_DIR/src/compiler/translator/SeparateArrayInitialization.cpp \ + $$ANGLE_DIR/src/compiler/translator/SeparateDeclarations.cpp \ + $$ANGLE_DIR/src/compiler/translator/SeparateExpressionsReturningArrays.cpp \ $$ANGLE_DIR/src/compiler/translator/ShaderLang.cpp \ $$ANGLE_DIR/src/compiler/translator/ShaderVars.cpp \ - $$ANGLE_DIR/src/compiler/translator/SeparateExpressionsReturningArrays.cpp \ + $$ANGLE_DIR/src/compiler/translator/SimplifyLoopConditions.cpp \ + $$ANGLE_DIR/src/compiler/translator/SplitSequenceOperator.cpp \ $$ANGLE_DIR/src/compiler/translator/StructureHLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/SymbolTable.cpp \ - $$ANGLE_DIR/src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp \ - $$ANGLE_DIR/src/compiler/translator/timing/RestrictVertexShaderTiming.cpp \ + $$ANGLE_DIR/src/compiler/translator/SymbolUniqueId.cpp \ + $$ANGLE_DIR/src/compiler/translator/TextureFunctionHLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/TranslatorESSL.cpp \ $$ANGLE_DIR/src/compiler/translator/TranslatorGLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/TranslatorHLSL.cpp \ + $$ANGLE_DIR/src/compiler/translator/TranslatorVulkan.cpp \ $$ANGLE_DIR/src/compiler/translator/Types.cpp \ - $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitToIf.cpp \ $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitAST.cpp \ + $$ANGLE_DIR/src/compiler/translator/UnfoldShortCircuitToIf.cpp \ $$ANGLE_DIR/src/compiler/translator/UniformHLSL.cpp \ + $$ANGLE_DIR/src/compiler/translator/UseInterfaceBlockFields.cpp \ $$ANGLE_DIR/src/compiler/translator/UtilsHLSL.cpp \ $$ANGLE_DIR/src/compiler/translator/util.cpp \ $$ANGLE_DIR/src/compiler/translator/ValidateGlobalInitializer.cpp \ $$ANGLE_DIR/src/compiler/translator/ValidateLimitations.cpp \ + $$ANGLE_DIR/src/compiler/translator/ValidateMaxParameters.cpp \ $$ANGLE_DIR/src/compiler/translator/ValidateOutputs.cpp \ $$ANGLE_DIR/src/compiler/translator/ValidateSwitch.cpp \ - $$ANGLE_DIR/src/compiler/translator/VariableInfo.cpp \ $$ANGLE_DIR/src/compiler/translator/VariablePacker.cpp \ + $$ANGLE_DIR/src/compiler/translator/ValidateVaryingLocations.cpp \ $$ANGLE_DIR/src/compiler/translator/VersionGLSL.cpp \ + $$ANGLE_DIR/src/compiler/translator/VectorizeVectorScalarArithmetic.cpp \ + $$ANGLE_DIR/src/compiler/translator/WrapSwitchStatementsInBlocks.cpp \ $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.cpp |