kc3-lang/angle/src/libANGLE/Uniform.cpp

• Show log

  Commit

• Hash : 9f48f931
  Author :
  Date : 2023-08-16T06:38:15
  

  Revert "Tightly pack LinkedUniform by using int16_t"
  
  This reverts commit 152cf62b38874238095a91307e4ea9bcdedf8f46.
  
  Reason for revert: Suspect cause of failure in for several Linux MSan Tests, e.g.
  https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20MSan%20Tests/42403/overview
  https://ci.chromium.org/ui/p/chromium/builders/ci/WebKit%20Linux%20MSAN/22174/overview
  https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20MSan%20Tests/42403/overview
  
  Original change's description:
  > Tightly pack LinkedUniform by using int16_t
  >
  > There is a check of vector size when we link uniforms and the maximum
  > vector size is 4096 due to we clamp the maxUniformBlockSize to 64KB. In
  > reality, if we exceeds this number, program link will take really long
  > time and then hit failure. So there is no real need to keep all the
  > variables in 32 bit integer. This CL changes to 16 bit integer. Further,
  > sh::BlockMemberInfo and ActiveVariable data members are embeded into
  > LinkedUniform struct as well so that the unused variables can be removed
  > and data can be tightly packed. This also makes LinkedUniform easier to
  > maintain as a simple struct with basic data types. With this change,
  > LinkedUniform size is reduced from 108 bytes down to 60 bytes, 48 bytes
  > reduction. Given some apps has 200-ish uniforms, this CL reduces 48
  > bytes x 200 = ~9K memory just for uniforms per program (which goes
  > through hash compute and decompression and file reads).
  >
  > Bug: b/275102061
  > Change-Id: I7fae20f5b75f3239305e2094a992e3040b8c8e4c
  > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4754133
  > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
  > Commit-Queue: Charlie Lao <cclao@google.com>
  
  Bug: b/275102061
  Change-Id: Id344e306307553731097f06edafc40bfeb73ff80
  No-Presubmit: true
  No-Tree-Checks: true
  No-Try: true
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4780494
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Commit-Queue: Geoff Lang <geofflang@chromium.org>
  

Download

• src/libANGLE/Uniform.cpp

• //
  // Copyright 2010 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.
  //
  
  #include "libANGLE/Uniform.h"
  #include "common/BinaryStream.h"
  #include "libANGLE/ProgramLinkedResources.h"
  
  #include <cstring>
  
  namespace gl
  {
  
  ActiveVariable::ActiveVariable()
  {
      std::fill(mIds.begin(), mIds.end(), 0);
  }
  
  ActiveVariable::~ActiveVariable() {}
  
  ActiveVariable::ActiveVariable(const ActiveVariable &rhs)            = default;
  ActiveVariable &ActiveVariable::operator=(const ActiveVariable &rhs) = default;
  
  void ActiveVariable::setActive(ShaderType shaderType, bool used, uint32_t id)
  {
      ASSERT(shaderType != ShaderType::InvalidEnum);
      mActiveUseBits.set(shaderType, used);
      mIds[shaderType] = id;
  }
  
  void ActiveVariable::unionReferencesWith(const ActiveVariable &other)
  {
      mActiveUseBits |= other.mActiveUseBits;
      for (const ShaderType shaderType : AllShaderTypes())
      {
          ASSERT(mIds[shaderType] == 0 || other.mIds[shaderType] == 0 ||
                 mIds[shaderType] == other.mIds[shaderType]);
          if (mIds[shaderType] == 0)
          {
              mIds[shaderType] = other.mIds[shaderType];
          }
      }
  }
  
  LinkedUniform::LinkedUniform()
  {
      memset(this, 0, sizeof(*this));
      blockInfo      = sh::BlockMemberInfo();
      activeVariable = ActiveVariable();
  }
  
  LinkedUniform::LinkedUniform(GLenum typeIn,
                               GLenum precisionIn,
                               const std::vector<unsigned int> &arraySizesIn,
                               const int bindingIn,
                               const int offsetIn,
                               const int locationIn,
                               const int bufferIndexIn,
                               const sh::BlockMemberInfo &blockInfoIn)
  {
      memset(this, 0, sizeof(*this));
      // Note: Ensure every data member is initialized.
      type                          = typeIn;
      precision                     = precisionIn;
      imageUnitFormat               = GL_NONE;
      location                      = locationIn;
      binding                       = bindingIn;
      offset                        = offsetIn;
      bufferIndex                   = bufferIndexIn;
      blockInfo                     = blockInfoIn;
      activeVariable                = ActiveVariable();
      id                            = 0;
      flattenedOffsetInParentArrays = -1;
      outerArraySizeProduct         = 1;
      outerArrayOffset              = 0;
      arraySize                     = arraySizesIn.empty() ? 1 : arraySizesIn[0];
  
      flagBitsAsUInt   = 0;
      flagBits.isArray = !arraySizesIn.empty();
      ASSERT(arraySizesIn.size() <= 1);
  }
  
  LinkedUniform::LinkedUniform(const LinkedUniform &other)
  {
      memcpy(this, &other, sizeof(LinkedUniform));
  }
  
  LinkedUniform::LinkedUniform(const UsedUniform &usedUniform)
  {
      memset(this, 0, sizeof(*this));
  
      ASSERT(!usedUniform.isArrayOfArrays());
      ASSERT(!usedUniform.isStruct());
      ASSERT(usedUniform.active);
  
      // Note: Ensure every data member is initialized.
      type                          = usedUniform.type;
      precision                     = usedUniform.precision;
      imageUnitFormat               = usedUniform.imageUnitFormat;
      location                      = usedUniform.location;
      binding                       = usedUniform.binding;
      offset                        = usedUniform.offset;
      bufferIndex                   = usedUniform.bufferIndex;
      blockInfo                     = usedUniform.blockInfo;
      activeVariable                = usedUniform.activeVariable;
      id                            = usedUniform.id;
      flattenedOffsetInParentArrays = usedUniform.getFlattenedOffsetInParentArrays();
      outerArraySizeProduct         = ArraySizeProduct(usedUniform.outerArraySizes);
      outerArrayOffset              = usedUniform.outerArrayOffset;
      arraySize                     = usedUniform.isArray() ? usedUniform.getArraySizeProduct() : 1u;
  
      flagBitsAsUInt               = 0;
      flagBits.isFragmentInOut     = usedUniform.isFragmentInOut;
      flagBits.texelFetchStaticUse = usedUniform.texelFetchStaticUse;
      flagBits.isArray             = usedUniform.isArray();
  }
  
  LinkedUniform::~LinkedUniform() {}
  
  BufferVariable::BufferVariable()
      : bufferIndex(-1), blockInfo(sh::kDefaultBlockMemberInfo), topLevelArraySize(-1)
  {}
  
  BufferVariable::BufferVariable(GLenum typeIn,
                                 GLenum precisionIn,
                                 const std::string &nameIn,
                                 const std::vector<unsigned int> &arraySizesIn,
                                 const int bufferIndexIn,
                                 const sh::BlockMemberInfo &blockInfoIn)
      : bufferIndex(bufferIndexIn), blockInfo(blockInfoIn), topLevelArraySize(-1)
  {
      type       = typeIn;
      precision  = precisionIn;
      name       = nameIn;
      arraySizes = arraySizesIn;
  }
  
  BufferVariable::~BufferVariable() {}
  
  ShaderVariableBuffer::ShaderVariableBuffer() : binding(0), dataSize(0) {}
  
  ShaderVariableBuffer::ShaderVariableBuffer(const ShaderVariableBuffer &other) = default;
  
  ShaderVariableBuffer::~ShaderVariableBuffer() {}
  
  int ShaderVariableBuffer::numActiveVariables() const
  {
      return static_cast<int>(memberIndexes.size());
  }
  
  InterfaceBlock::InterfaceBlock() : isArray(false), isReadOnly(false), arrayElement(0) {}
  
  InterfaceBlock::InterfaceBlock(const std::string &nameIn,
                                 const std::string &mappedNameIn,
                                 bool isArrayIn,
                                 bool isReadOnlyIn,
                                 unsigned int arrayElementIn,
                                 unsigned int firstFieldArraySizeIn,
                                 int bindingIn)
      : name(nameIn),
        mappedName(mappedNameIn),
        isArray(isArrayIn),
        isReadOnly(isReadOnlyIn),
        arrayElement(arrayElementIn),
        firstFieldArraySize(firstFieldArraySizeIn)
  {
      binding = bindingIn;
  }
  
  InterfaceBlock::InterfaceBlock(const InterfaceBlock &other) = default;
  
  std::string InterfaceBlock::nameWithArrayIndex() const
  {
      std::stringstream fullNameStr;
      fullNameStr << name;
      if (isArray)
      {
          fullNameStr << "[" << arrayElement << "]";
      }
  
      return fullNameStr.str();
  }
  
  std::string InterfaceBlock::mappedNameWithArrayIndex() const
  {
      std::stringstream fullNameStr;
      fullNameStr << mappedName;
      if (isArray)
      {
          fullNameStr << "[" << arrayElement << "]";
      }
  
      return fullNameStr.str();
  }
  }  // namespace gl
  

Download