kc3-lang/angle/src/compiler.gypi

• Show log

  Commit

• Hash : 1d122789
  Author :
  Date : 2015-11-06T15:35:17
  

  Fix constructor constant folding
  
  The previous solution for constant folding constructors was significantly
  overengineered and partially incorrect. Switch to a much simpler
  constructor folding function that does not use an AST traverser, but
  simply iterates over the constant folded parameters of the constructor
  and doesn't do any unnecessary checks. It also reuses some code for
  constant folding other built-in functions.
  
  This fixes issues with initializing constant matrices with only a single
  parameter. Instead of copying the first component of the constructor
  parameter all over the matrix, passing a vec4 or matrix argument now
  assigns the values correctly.
  
  BUG=angleproject:1193
  TEST=angle_unittests, WebGL conformance tests
  
  Change-Id: I50b10721ea30cb15843fba892c1b1a211f1d72e5
  Reviewed-on: https://chromium-review.googlesource.com/311191
  Tryjob-Request: Olli Etuaho <oetuaho@nvidia.com>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Zhenyao Mo <zmo@chromium.org>
  Tested-by: Olli Etuaho <oetuaho@nvidia.com>
  

Download

• src/compiler.gypi

• # Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
  # Use of this source code is governed by a BSD-style license that can be
  # found in the LICENSE file.
  
  {
      'variables':
      {
          # These file lists are shared with the GN build.
          'angle_translator_lib_sources':
          [
              '../include/EGL/egl.h',
              '../include/EGL/eglext.h',
              '../include/EGL/eglplatform.h',
              '../include/GLES2/gl2.h',
              '../include/GLES2/gl2ext.h',
              '../include/GLES2/gl2platform.h',
              '../include/GLES3/gl3.h',
              '../include/GLES3/gl3platform.h',
              '../include/GLES3/gl31.h',
              '../include/GLES3/gl32.h',
              '../include/GLSLANG/ShaderLang.h',
              '../include/GLSLANG/ShaderVars.h',
              '../include/KHR/khrplatform.h',
              '../include/angle_gl.h',
              'compiler/translator/BaseTypes.h',
              'compiler/translator/BuiltInFunctionEmulator.cpp',
              'compiler/translator/BuiltInFunctionEmulator.h',
              'compiler/translator/BuiltInFunctionEmulatorGLSL.cpp',
              'compiler/translator/BuiltInFunctionEmulatorGLSL.h',
              'compiler/translator/Cache.cpp',
              'compiler/translator/Cache.h',
              'compiler/translator/CallDAG.cpp',
              'compiler/translator/CallDAG.h',
              'compiler/translator/CodeGen.cpp',
              'compiler/translator/Common.h',
              'compiler/translator/Compiler.cpp',
              'compiler/translator/Compiler.h',
              'compiler/translator/ConstantUnion.h',
              'compiler/translator/Diagnostics.cpp',
              'compiler/translator/Diagnostics.h',
              'compiler/translator/DirectiveHandler.cpp',
              'compiler/translator/DirectiveHandler.h',
              'compiler/translator/EmulatePrecision.cpp',
              'compiler/translator/EmulatePrecision.h',
              'compiler/translator/ExtensionBehavior.h',
              'compiler/translator/ExtensionGLSL.cpp',
              'compiler/translator/ExtensionGLSL.h',
              'compiler/translator/FlagStd140Structs.cpp',
              'compiler/translator/FlagStd140Structs.h',
              'compiler/translator/ForLoopUnroll.cpp',
              'compiler/translator/ForLoopUnroll.h',
              'compiler/translator/HashNames.h',
              'compiler/translator/InfoSink.cpp',
              'compiler/translator/InfoSink.h',
              'compiler/translator/Initialize.cpp',
              'compiler/translator/Initialize.h',
              'compiler/translator/InitializeDll.cpp',
              'compiler/translator/InitializeDll.h',
              'compiler/translator/InitializeGlobals.h',
              'compiler/translator/InitializeParseContext.cpp',
              'compiler/translator/InitializeParseContext.h',
              'compiler/translator/InitializeVariables.cpp',
              'compiler/translator/InitializeVariables.h',
              'compiler/translator/IntermNode.h',
              'compiler/translator/IntermNode.cpp',
              'compiler/translator/IntermTraverse.cpp',
              'compiler/translator/Intermediate.h',
              'compiler/translator/Intermediate.cpp',
              'compiler/translator/LoopInfo.cpp',
              'compiler/translator/LoopInfo.h',
              'compiler/translator/MMap.h',
              'compiler/translator/NodeSearch.h',
              'compiler/translator/Operator.cpp',
              'compiler/translator/Operator.h',
              'compiler/translator/OutputESSL.cpp',
              'compiler/translator/OutputESSL.h',
              'compiler/translator/OutputGLSL.cpp',
              'compiler/translator/OutputGLSL.h',
              'compiler/translator/OutputGLSLBase.cpp',
              'compiler/translator/OutputGLSLBase.h',
              'compiler/translator/ParseContext.cpp',
              'compiler/translator/ParseContext.h',
              'compiler/translator/PoolAlloc.cpp',
              'compiler/translator/PoolAlloc.h',
              'compiler/translator/Pragma.h',
              'compiler/translator/PruneEmptyDeclarations.cpp',
              'compiler/translator/PruneEmptyDeclarations.h',
              'compiler/translator/RecordConstantPrecision.cpp',
              'compiler/translator/RecordConstantPrecision.h',
              'compiler/translator/RegenerateStructNames.cpp',
              'compiler/translator/RegenerateStructNames.h',
              'compiler/translator/RemovePow.cpp',
              'compiler/translator/RemovePow.h',
              'compiler/translator/RewriteDoWhile.cpp',
              'compiler/translator/RewriteDoWhile.h',
              'compiler/translator/RenameFunction.h',
              'compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp',
              'compiler/translator/ScalarizeVecAndMatConstructorArgs.h',
              'compiler/translator/SearchSymbol.cpp',
              'compiler/translator/SearchSymbol.h',
              'compiler/translator/SymbolTable.cpp',
              'compiler/translator/SymbolTable.h',
              'compiler/translator/TranslatorESSL.cpp',
              'compiler/translator/TranslatorESSL.h',
              'compiler/translator/TranslatorGLSL.cpp',
              'compiler/translator/TranslatorGLSL.h',
              'compiler/translator/Types.cpp',
              'compiler/translator/Types.h',
              'compiler/translator/UnfoldShortCircuitAST.cpp',
              'compiler/translator/UnfoldShortCircuitAST.h',
              'compiler/translator/ValidateGlobalInitializer.cpp',
              'compiler/translator/ValidateGlobalInitializer.h',
              'compiler/translator/ValidateLimitations.cpp',
              'compiler/translator/ValidateLimitations.h',
              'compiler/translator/ValidateOutputs.cpp',
              'compiler/translator/ValidateOutputs.h',
              'compiler/translator/ValidateSwitch.cpp',
              'compiler/translator/ValidateSwitch.h',
              'compiler/translator/VariableInfo.cpp',
              'compiler/translator/VariableInfo.h',
              'compiler/translator/VariablePacker.cpp',
              'compiler/translator/VariablePacker.h',
              'compiler/translator/VersionGLSL.cpp',
              'compiler/translator/VersionGLSL.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',
              'compiler/translator/glslang_lex.cpp',
              'compiler/translator/glslang_tab.cpp',
              '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_lib_hlsl_sources':
          [
              'compiler/translator/ArrayReturnValueToOutParameter.cpp',
              'compiler/translator/ArrayReturnValueToOutParameter.h',
              'compiler/translator/ASTMetadataHLSL.cpp',
              'compiler/translator/ASTMetadataHLSL.h',
              'compiler/translator/blocklayoutHLSL.cpp',
              'compiler/translator/blocklayoutHLSL.h',
              'compiler/translator/BuiltInFunctionEmulatorHLSL.cpp',
              'compiler/translator/BuiltInFunctionEmulatorHLSL.h',
              'compiler/translator/OutputHLSL.cpp',
              'compiler/translator/OutputHLSL.h',
              'compiler/translator/RemoveDynamicIndexing.cpp',
              'compiler/translator/RemoveDynamicIndexing.h',
              'compiler/translator/RemoveSwitchFallThrough.cpp',
              'compiler/translator/RemoveSwitchFallThrough.h',
              'compiler/translator/RewriteElseBlocks.cpp',
              'compiler/translator/RewriteElseBlocks.h',
              'compiler/translator/SeparateArrayInitialization.cpp',
              'compiler/translator/SeparateArrayInitialization.h',
              'compiler/translator/SeparateDeclarations.cpp',
              'compiler/translator/SeparateDeclarations.h',
              'compiler/translator/SeparateExpressionsReturningArrays.cpp',
              'compiler/translator/SeparateExpressionsReturningArrays.h',
              'compiler/translator/StructureHLSL.cpp',
              'compiler/translator/StructureHLSL.h',
              'compiler/translator/TranslatorHLSL.cpp',
              'compiler/translator/TranslatorHLSL.h',
              'compiler/translator/UnfoldShortCircuitToIf.cpp',
              'compiler/translator/UnfoldShortCircuitToIf.h',
              'compiler/translator/UniformHLSL.cpp',
              'compiler/translator/UniformHLSL.h',
              'compiler/translator/UtilsHLSL.cpp',
              'compiler/translator/UtilsHLSL.h',
          ],
          'angle_preprocessor_sources':
          [
              'compiler/preprocessor/DiagnosticsBase.cpp',
              'compiler/preprocessor/DiagnosticsBase.h',
              'compiler/preprocessor/DirectiveHandlerBase.cpp',
              'compiler/preprocessor/DirectiveHandlerBase.h',
              'compiler/preprocessor/DirectiveParser.cpp',
              'compiler/preprocessor/DirectiveParser.h',
              'compiler/preprocessor/ExpressionParser.cpp',
              'compiler/preprocessor/ExpressionParser.h',
              'compiler/preprocessor/ExpressionParser.y',
              'compiler/preprocessor/Input.cpp',
              'compiler/preprocessor/Input.h',
              'compiler/preprocessor/Lexer.cpp',
              'compiler/preprocessor/Lexer.h',
              'compiler/preprocessor/Macro.cpp',
              'compiler/preprocessor/Macro.h',
              'compiler/preprocessor/MacroExpander.cpp',
              'compiler/preprocessor/MacroExpander.h',
              'compiler/preprocessor/Preprocessor.cpp',
              'compiler/preprocessor/Preprocessor.h',
              'compiler/preprocessor/SourceLocation.h',
              'compiler/preprocessor/Token.cpp',
              'compiler/preprocessor/Token.h',
              'compiler/preprocessor/Tokenizer.cpp',
              '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
      # anything also change angle/BUILD.gn
      'targets':
      [
          {
              'target_name': 'preprocessor',
              'type': 'static_library',
              'includes': [ '../build/common_defines.gypi', ],
              'sources': [ '<@(angle_preprocessor_sources)', ],
          },
          {
              'target_name': 'translator_lib',
              'type': 'static_library',
              'dependencies': [ 'preprocessor', 'angle_common' ],
              '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_lib_sources)',
              ],
              'msvs_settings':
              {
                'VCLibrarianTool':
                {
                  'AdditionalOptions': ['/ignore:4221']
                },
              },
              'conditions':
              [
                  ['angle_enable_hlsl==1',
                  {
                      'defines':
                      [
                          'ANGLE_ENABLE_HLSL',
                      ],
                      'direct_dependent_settings':
                      {
                          'defines':
                          [
                              'ANGLE_ENABLE_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'
              ],
          },
      ],
  }
  

Download