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

• Show log

  Commit

• Hash : 24f4007b
  Author :
  Date : 2023-06-08T00:41:55
  

  Vulkan: Use SPIR-V ids instead of names in the transformer
  
  This change removes the SPIR-V transformer's reliance on type and
  variable names.  As a result:
  
  - String hashing is removed from the info map data structure and the
    SPIR-V transformer
  - The ID discovery class is entirely removed
  - Internal variable names have become a detail of the compiler alone
    (and are no longer exposed as part of the compiler interface)
  - Some front-end name tracking is removed ("parentStructMappedName",
    etc)
  
  This change also properly cleans up xfb emulation types that were
  previously left over.
  
  This change allows the SPIR-V compiler to emit user strings as-is
  instead of prefixing them with `u_` leading to more readable debug
  shaders.  Additionally, it will make it possible not to emit debug info
  at all.  Both of these changes will be done in follow ups.
  
  Bug: angleproject:7220
  Change-Id: Iaa127496209a27aaae2e0d14c41b22fffb0b72a2
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4600610
  Reviewed-by: Roman Lavrov <romanl@google.com>
  Reviewed-by: Yuxin Hu <yuxinhu@google.com>
  Commit-Queue: Shahbaz Youssefi <syoussefi@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 <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()
      : typeInfo(nullptr),
        bufferIndex(-1),
        blockInfo(sh::kDefaultBlockMemberInfo),
        outerArrayOffset(0)
  {}
  
  LinkedUniform::LinkedUniform(GLenum typeIn,
                               GLenum precisionIn,
                               const std::string &nameIn,
                               const std::vector<unsigned int> &arraySizesIn,
                               const int bindingIn,
                               const int offsetIn,
                               const int locationIn,
                               const int bufferIndexIn,
                               const sh::BlockMemberInfo &blockInfoIn)
      : typeInfo(&GetUniformTypeInfo(typeIn)),
        bufferIndex(bufferIndexIn),
        blockInfo(blockInfoIn),
        outerArrayOffset(0)
  {
      type       = typeIn;
      precision  = precisionIn;
      name       = nameIn;
      arraySizes = arraySizesIn;
      binding    = bindingIn;
      offset     = offsetIn;
      location   = locationIn;
      ASSERT(!isArrayOfArrays());
      ASSERT(!isArray() || !isStruct());
  }
  
  LinkedUniform::LinkedUniform(const sh::ShaderVariable &uniform)
      : sh::ShaderVariable(uniform),
        typeInfo(&GetUniformTypeInfo(type)),
        bufferIndex(-1),
        blockInfo(sh::kDefaultBlockMemberInfo)
  {
      ASSERT(!isArrayOfArrays());
      ASSERT(!isArray() || !isStruct());
  }
  
  LinkedUniform::LinkedUniform(const LinkedUniform &uniform)
      : sh::ShaderVariable(uniform),
        ActiveVariable(uniform),
        typeInfo(uniform.typeInfo),
        bufferIndex(uniform.bufferIndex),
        blockInfo(uniform.blockInfo),
        outerArraySizes(uniform.outerArraySizes),
        outerArrayOffset(uniform.outerArrayOffset)
  {}
  
  LinkedUniform &LinkedUniform::operator=(const LinkedUniform &uniform)
  {
      sh::ShaderVariable::operator=(uniform);
      ActiveVariable::operator=(uniform);
      typeInfo         = uniform.typeInfo;
      bufferIndex      = uniform.bufferIndex;
      blockInfo        = uniform.blockInfo;
      outerArraySizes  = uniform.outerArraySizes;
      outerArrayOffset = uniform.outerArrayOffset;
      return *this;
  }
  
  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