kc3-lang/angle/src/compiler/translator/tree_ops/SeparateStructFromFunctionDeclarations.cpp

• Show log

  Commit

• Hash : 5a4bfd61
  Author :
  Date : 2024-01-12T17:15:39
  

  Metal: Separate struct definition from function return
  
  The EmitMetal pass in shader translator does not handle writing the
  defintion of a structure that is declared in the return type of a
  function, such as:
  
      struct Foo { float val; } foo() {
          ...
      }
  
  This change adds a new pass, SeparateStructFromFunctionDeclarations, to
  separate the definition and declaration of struct variables in function
  prototypes into two statements, such as:
  
      struct Foo { float val; } foo();
      struct Bar { int val; } bar() { ... }
      void main() { ... }
      Foo foo() { ... }
  
  into:
  
      struct Foo { float val; };
      Foo foo();
      struct Bar { int val; };
      Bar bar() { ... }
      void main() { ... }
      Foo foo() { ... }
  
  Fixed: angleproject:8302
  Change-Id: Id8b6ba256d3c8375dd889facd70e4715261c1ca3
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5191644
  Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
  Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
  

Download

• src/compiler/translator/tree_ops/SeparateStructFromFunctionDeclarations.cpp

• //
  // Copyright 2024 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.
  //
  // SeparateStructFromFunctionDeclarations: Separate struct declarations from function declaration
  // return type.
  //
  
  #include "compiler/translator/tree_ops/SeparateStructFromFunctionDeclarations.h"
  #include "compiler/translator/SymbolTable.h"
  #include "compiler/translator/tree_util/IntermTraverse.h"
  
  namespace sh
  {
  namespace
  {
  class Traverser : public TIntermTraverser
  {
    public:
      explicit Traverser(TSymbolTable *symbolTable)
          : TIntermTraverser(true, false, false, symbolTable)
      {}
  
      void visitFunctionPrototype(TIntermFunctionPrototype *node) override
      {
          const TFunction *function = node->getFunction();
          if (mFunctionsToReplace.count(function) > 0)
          {
              TIntermFunctionPrototype *newFuncProto =
                  new TIntermFunctionPrototype(mFunctionsToReplace[function]);
              queueReplacement(newFuncProto, OriginalNode::IS_DROPPED);
          }
          else
          {
              const TType &type = node->getType();
              if (type.isStructSpecifier())
              {
                  doReplacement(function, type);
              }
          }
      }
  
      bool visitAggregate(Visit visit, TIntermAggregate *node) override
      {
          const TFunction *function = node->getFunction();
          if (mFunctionsToReplace.count(function) > 0)
          {
              TIntermAggregate *replacementNode = TIntermAggregate::CreateFunctionCall(
                  *mFunctionsToReplace[function], node->getSequence());
              queueReplacement(replacementNode, OriginalNode::IS_DROPPED);
          }
          return true;
      }
  
    private:
      void doReplacement(const TFunction *function, const TType &oldType)
      {
          const TStructure *structure = oldType.getStruct();
          // Name unnamed inline structs
          if (structure->symbolType() == SymbolType::Empty)
          {
              structure = new TStructure(mSymbolTable, kEmptyImmutableString, &structure->fields(),
                                         SymbolType::AngleInternal);
          }
  
          TVariable *structVar = new TVariable(mSymbolTable, ImmutableString(""),
                                               new TType(structure, true), SymbolType::Empty);
          insertStatementInParentBlock(new TIntermDeclaration({structVar}));
  
          TType *returnType = new TType(structure, false);
          if (oldType.isArray())
          {
              returnType->makeArrays(oldType.getArraySizes());
          }
          returnType->setQualifier(oldType.getQualifier());
  
          const TFunction *oldFunc = function;
          ASSERT(oldFunc->symbolType() == SymbolType::UserDefined);
  
          const TFunction *newFunc =
              cloneFunctionAndChangeReturnType(mSymbolTable, oldFunc, returnType);
  
          TIntermFunctionPrototype *newFuncProto = new TIntermFunctionPrototype(newFunc);
          queueReplacement(newFuncProto, OriginalNode::IS_DROPPED);
  
          mFunctionsToReplace[oldFunc] = newFunc;
      }
  
      const TFunction *cloneFunctionAndChangeReturnType(TSymbolTable *symbolTable,
                                                        const TFunction *oldFunc,
                                                        const TType *newReturnType)
  
      {
          ASSERT(oldFunc->symbolType() == SymbolType::UserDefined);
  
          TFunction *newFunc = new TFunction(symbolTable, oldFunc->name(), oldFunc->symbolType(),
                                             newReturnType, oldFunc->isKnownToNotHaveSideEffects());
  
          if (oldFunc->isDefined())
          {
              newFunc->setDefined();
          }
  
          if (oldFunc->hasPrototypeDeclaration())
          {
              newFunc->setHasPrototypeDeclaration();
          }
  
          const size_t paramCount = oldFunc->getParamCount();
          for (size_t i = 0; i < paramCount; ++i)
          {
              const TVariable *var = oldFunc->getParam(i);
              newFunc->addParameter(var);
          }
  
          return newFunc;
      }
  
      using FunctionReplacement = angle::HashMap<const TFunction *, const TFunction *>;
      FunctionReplacement mFunctionsToReplace;
  };
  
  }  // anonymous namespace
  
  bool SeparateStructFromFunctionDeclarations(TCompiler *compiler,
                                              TIntermBlock *root,
                                              TSymbolTable *symbolTable)
  {
      Traverser separateStructDecls(symbolTable);
      root->traverse(&separateStructDecls);
      return separateStructDecls.updateTree(compiler, root);
  }
  }  // namespace sh
  

Download