From 4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 11 Jul 2018 18:11:13 +0200 Subject: Roll back to ANGLE/2845 --- gfx/angle/src/compiler.gypi | 106 +++++++++++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 27 deletions(-) (limited to 'gfx/angle/src/compiler.gypi') diff --git a/gfx/angle/src/compiler.gypi b/gfx/angle/src/compiler.gypi index 279d5af9c..5f28881a9 100755 --- a/gfx/angle/src/compiler.gypi +++ b/gfx/angle/src/compiler.gypi @@ -6,7 +6,7 @@ 'variables': { # These file lists are shared with the GN build. - 'angle_translator_sources': + 'angle_translator_lib_sources': [ '../include/EGL/egl.h', '../include/EGL/eglext.h', @@ -22,13 +22,9 @@ '../include/GLSLANG/ShaderVars.h', '../include/KHR/khrplatform.h', '../include/angle_gl.h', - 'compiler/translator/AddAndTrueToLoopCondition.cpp', - 'compiler/translator/AddAndTrueToLoopCondition.h', 'compiler/translator/BaseTypes.h', 'compiler/translator/BuiltInFunctionEmulator.cpp', 'compiler/translator/BuiltInFunctionEmulator.h', - 'compiler/translator/BreakVariableAliasingInInnerLoops.cpp', - 'compiler/translator/BreakVariableAliasingInInnerLoops.h', 'compiler/translator/Cache.cpp', 'compiler/translator/Cache.h', 'compiler/translator/CallDAG.cpp', @@ -37,7 +33,6 @@ 'compiler/translator/Common.h', 'compiler/translator/Compiler.cpp', 'compiler/translator/Compiler.h', - 'compiler/translator/ConstantUnion.cpp', 'compiler/translator/ConstantUnion.h', 'compiler/translator/DeferGlobalInitializers.cpp', 'compiler/translator/DeferGlobalInitializers.h', @@ -86,36 +81,27 @@ 'compiler/translator/Pragma.h', 'compiler/translator/PruneEmptyDeclarations.cpp', 'compiler/translator/PruneEmptyDeclarations.h', - 'compiler/translator/QualifierTypes.h', - 'compiler/translator/QualifierTypes.cpp', 'compiler/translator/RecordConstantPrecision.cpp', 'compiler/translator/RecordConstantPrecision.h', 'compiler/translator/RegenerateStructNames.cpp', 'compiler/translator/RegenerateStructNames.h', - 'compiler/translator/RemoveInvariantDeclaration.cpp', - 'compiler/translator/RemoveInvariantDeclaration.h', 'compiler/translator/RemovePow.cpp', 'compiler/translator/RemovePow.h', 'compiler/translator/RewriteDoWhile.cpp', 'compiler/translator/RewriteDoWhile.h', 'compiler/translator/RewriteTexelFetchOffset.cpp', 'compiler/translator/RewriteTexelFetchOffset.h', - 'compiler/translator/RewriteUnaryMinusOperatorInt.cpp', - 'compiler/translator/RewriteUnaryMinusOperatorInt.h', + 'compiler/translator/RenameFunction.h', 'compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp', 'compiler/translator/ScalarizeVecAndMatConstructorArgs.h', 'compiler/translator/SearchSymbol.cpp', 'compiler/translator/SearchSymbol.h', - 'compiler/translator/ShaderLang.cpp', - 'compiler/translator/ShaderVars.cpp', 'compiler/translator/SymbolTable.cpp', 'compiler/translator/SymbolTable.h', 'compiler/translator/Types.cpp', 'compiler/translator/Types.h', 'compiler/translator/UnfoldShortCircuitAST.cpp', 'compiler/translator/UnfoldShortCircuitAST.h', - 'compiler/translator/UseInterfaceBlockFields.cpp', - 'compiler/translator/UseInterfaceBlockFields.h', 'compiler/translator/ValidateGlobalInitializer.cpp', 'compiler/translator/ValidateGlobalInitializer.h', 'compiler/translator/ValidateLimitations.cpp', @@ -132,6 +118,13 @@ 'compiler/translator/VariablePacker.h', 'compiler/translator/blocklayout.cpp', 'compiler/translator/blocklayout.h', + 'compiler/translator/depgraph/DependencyGraph.cpp', + 'compiler/translator/depgraph/DependencyGraph.h', + 'compiler/translator/depgraph/DependencyGraphBuilder.cpp', + 'compiler/translator/depgraph/DependencyGraphBuilder.h', + 'compiler/translator/depgraph/DependencyGraphOutput.cpp', + 'compiler/translator/depgraph/DependencyGraphOutput.h', + 'compiler/translator/depgraph/DependencyGraphTraverse.cpp', 'compiler/translator/glslang.h', 'compiler/translator/glslang.l', 'compiler/translator/glslang.y', @@ -140,19 +133,23 @@ 'compiler/translator/glslang_tab.h', 'compiler/translator/intermOut.cpp', 'compiler/translator/length_limits.h', + 'compiler/translator/timing/RestrictFragmentShaderTiming.cpp', + 'compiler/translator/timing/RestrictFragmentShaderTiming.h', + 'compiler/translator/timing/RestrictVertexShaderTiming.cpp', + 'compiler/translator/timing/RestrictVertexShaderTiming.h', 'compiler/translator/util.cpp', 'compiler/translator/util.h', 'third_party/compiler/ArrayBoundsClamper.cpp', 'third_party/compiler/ArrayBoundsClamper.h', ], - 'angle_translator_essl_sources': + 'angle_translator_lib_essl_sources': [ 'compiler/translator/OutputESSL.cpp', 'compiler/translator/OutputESSL.h', 'compiler/translator/TranslatorESSL.cpp', 'compiler/translator/TranslatorESSL.h', ], - 'angle_translator_glsl_sources': + 'angle_translator_lib_glsl_sources': [ 'compiler/translator/BuiltInFunctionEmulatorGLSL.cpp', 'compiler/translator/BuiltInFunctionEmulatorGLSL.h', @@ -167,7 +164,7 @@ 'compiler/translator/VersionGLSL.cpp', 'compiler/translator/VersionGLSL.h', ], - 'angle_translator_hlsl_sources': + 'angle_translator_lib_hlsl_sources': [ 'compiler/translator/AddDefaultReturnStatements.cpp', 'compiler/translator/AddDefaultReturnStatements.h', @@ -240,6 +237,7 @@ 'compiler/preprocessor/Tokenizer.h', 'compiler/preprocessor/Tokenizer.l', 'compiler/preprocessor/numeric_lex.h', + 'compiler/preprocessor/pp_utils.h', ], }, # Everything below this is duplicated in the GN build. If you change @@ -249,23 +247,28 @@ { 'target_name': 'preprocessor', 'type': 'static_library', - 'dependencies': [ 'angle_common' ], - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'sources': [ '<@(angle_preprocessor_sources)', ], }, { - 'target_name': 'translator', + 'target_name': 'translator_lib', 'type': 'static_library', 'dependencies': [ 'preprocessor', 'angle_common' ], - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'include_dirs': [ '.', '../include', ], + 'defines': + [ + # define the static translator to indicate exported + # classes are (in fact) locally defined + 'ANGLE_TRANSLATOR_STATIC', + ], 'sources': [ - '<@(angle_translator_sources)', + '<@(angle_translator_lib_sources)', ], 'msvs_settings': { @@ -291,7 +294,7 @@ }, 'sources': [ - '<@(angle_translator_essl_sources)', + '<@(angle_translator_lib_essl_sources)', ], }], ['angle_enable_glsl==1', @@ -309,7 +312,7 @@ }, 'sources': [ - '<@(angle_translator_glsl_sources)', + '<@(angle_translator_lib_glsl_sources)', ], }], ['angle_enable_hlsl==1', @@ -327,10 +330,59 @@ }, 'sources': [ - '<@(angle_translator_hlsl_sources)', + '<@(angle_translator_lib_hlsl_sources)', ], }], ], }, + + { + 'target_name': 'translator', + 'type': '<(component)', + 'dependencies': [ 'translator_lib', 'angle_common' ], + 'includes': [ '../build/common_defines.gypi', ], + 'include_dirs': + [ + '.', + '../include', + ], + 'defines': + [ + 'ANGLE_TRANSLATOR_IMPLEMENTATION', + ], + 'sources': + [ + 'compiler/translator/ShaderLang.cpp', + 'compiler/translator/ShaderVars.cpp' + ], + }, + + { + 'target_name': 'translator_static', + 'type': 'static_library', + 'dependencies': [ 'translator_lib' ], + 'includes': [ '../build/common_defines.gypi', ], + 'include_dirs': + [ + '.', + '../include', + ], + 'defines': + [ + 'ANGLE_TRANSLATOR_STATIC', + ], + 'direct_dependent_settings': + { + 'defines': + [ + 'ANGLE_TRANSLATOR_STATIC', + ], + }, + 'sources': + [ + 'compiler/translator/ShaderLang.cpp', + 'compiler/translator/ShaderVars.cpp' + ], + }, ], } -- cgit v1.2.3