kc3-lang/angle/src/compiler/translator/SeparateArrayConstructorStatements.cpp

• Show log

  Commit

• Hash : fa886975
  Author :
  Date : 2018-01-18T19:24:54
  

  Fix handling array constructor statements in HLSL output
  
  Array constructors that are used as a statement by themselves need to
  be pruned from the AST before writing HLSL output.
  
  This fixes an assert in OutputHLSL.
  
  BUG=angleproject:2307
  TEST=angle_unittests
  
  Change-Id: Ib49461a4be173f3856f5a264ac0af8d818a61798
  Reviewed-on: https://chromium-review.googlesource.com/874691
  Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
  Reviewed-by: Corentin Wallez <cwallez@chromium.org>
  

Download

• src/compiler/translator/SeparateArrayConstructorStatements.cpp

• //
  // Copyright (c) 2018 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.
  //
  // SeparateArrayConstructorStatements splits statements that are array constructors and drops all of
  // their constant arguments. For example, a statement like:
  //   int[2](0, i++);
  // Will be changed to:
  //   i++;
  
  #include "compiler/translator/SeparateArrayConstructorStatements.h"
  
  #include "compiler/translator/IntermTraverse.h"
  
  namespace sh
  {
  
  namespace
  {
  
  void SplitConstructorArgs(const TIntermSequence &originalArgs, TIntermSequence *argsOut)
  {
      for (TIntermNode *arg : originalArgs)
      {
          TIntermTyped *argTyped = arg->getAsTyped();
          if (argTyped->hasSideEffects())
          {
              TIntermAggregate *argAggregate = argTyped->getAsAggregate();
              if (argTyped->isArray() && argAggregate && argAggregate->isConstructor())
              {
                  SplitConstructorArgs(*argAggregate->getSequence(), argsOut);
              }
              else
              {
                  argsOut->push_back(argTyped);
              }
          }
      }
  }
  
  class SeparateArrayConstructorStatementsTraverser : public TIntermTraverser
  {
    public:
      SeparateArrayConstructorStatementsTraverser();
  
      bool visitAggregate(Visit visit, TIntermAggregate *node) override;
  };
  
  SeparateArrayConstructorStatementsTraverser::SeparateArrayConstructorStatementsTraverser()
      : TIntermTraverser(true, false, false)
  {
  }
  
  bool SeparateArrayConstructorStatementsTraverser::visitAggregate(Visit visit,
                                                                   TIntermAggregate *node)
  {
      TIntermBlock *parentAsBlock = getParentNode()->getAsBlock();
      if (!parentAsBlock)
      {
          return false;
      }
      if (!node->isArray() || !node->isConstructor())
      {
          return false;
      }
  
      TIntermSequence constructorArgs;
      SplitConstructorArgs(*node->getSequence(), &constructorArgs);
      mMultiReplacements.push_back(
          NodeReplaceWithMultipleEntry(parentAsBlock, node, constructorArgs));
  
      return false;
  }
  
  }  // namespace
  
  void SeparateArrayConstructorStatements(TIntermBlock *root)
  {
      SeparateArrayConstructorStatementsTraverser traverser;
      root->traverse(&traverser);
      traverser.updateTree();
  }
  
  }  // namespace sh
  

Download