kc3-lang/angle/src/compiler/translator/StructureHLSL.h

• Show log

  Commit

• Hash : 33a74bde
  Author :
  Date : 2014-08-18T15:47:59
  

  Fix std140 UBO layouts.
  
  A call to "prePadding" instaed of "prePaddingString" was confusing
  the HLSL output engine.
  
  A separate bug was causing HLSL errors because HLSL puts all cbuffer
  members in a flattened namespace, which caused our internal padding
  variables to overlap.
  
  BUG=angle:725
  
  Change-Id: I69a01fefa430a83e433385c64a532a69e6851ae8
  Reviewed-on: https://chromium-review.googlesource.com/212930
  Tested-by: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Nicolas Capens <capn@chromium.org>
  

Download

• src/compiler/translator/StructureHLSL.h

• //
  // Copyright (c) 2014 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.
  //
  // StructureHLSL.h:
  //   Interfaces of methods for HLSL translation of GLSL structures.
  //
  
  #ifndef TRANSLATOR_STRUCTUREHLSL_H_
  #define TRANSLATOR_STRUCTUREHLSL_H_
  
  #include "compiler/translator/Common.h"
  #include "compiler/translator/IntermNode.h"
  
  #include <set>
  
  class TInfoSinkBase;
  class TScopeBracket;
  
  namespace sh
  {
  
  // This helper class assists structure and interface block definitions in determining
  // how to pack std140 structs within HLSL's packing rules.
  class Std140PaddingHelper
  {
    public:
      explicit Std140PaddingHelper(const std::map<TString, int> &structElementIndexes,
                                   unsigned *uniqueCounter);
  
      int elementIndex() const { return mElementIndex; }
      int prePadding(const TType &type);
      TString prePaddingString(const TType &type);
      TString postPaddingString(const TType &type, bool useHLSLRowMajorPacking);
  
    private:
      TString next();
  
      unsigned *mPaddingCounter;
      int mElementIndex;
      const std::map<TString, int> &mStructElementIndexes;
  };
  
  class StructureHLSL
  {
    public:
      StructureHLSL();
  
      void addConstructor(const TType &type, const TString &name, const TIntermSequence *parameters);
      std::string structsHeader() const;
  
      TString defineQualified(const TStructure &structure, bool useHLSLRowMajorPacking, bool useStd140Packing);
      static TString defineNameless(const TStructure &structure);
  
      Std140PaddingHelper getPaddingHelper();
  
    private:
      unsigned mUniquePaddingCounter;
  
      std::map<TString, int> mStd140StructElementIndexes;
  
      typedef std::set<TString> StructNames;
      StructNames mStructNames;
  
      typedef std::set<TString> Constructors;
      Constructors mConstructors;
  
      typedef std::vector<TString> StructDeclarations;
      StructDeclarations mStructDeclarations;
  
      void storeStd140ElementIndex(const TStructure &structure, bool useHLSLRowMajorPacking);
      static TString define(const TStructure &structure, bool useHLSLRowMajorPacking,
                           bool useStd140Packing, Std140PaddingHelper *padHelper);
  };
  
  }
  
  #endif // COMPILER_STRUCTUREHLSL_H_
  

Download