Edit

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

Branch :

  • Show log

    Commit

  • Author : jchen10
    Date : 2017-04-19 09:10:56
    Hash : af713a24
    Message : ES31: Implement binding layout for uniform blocks The binding point of uniform blocks can be specified in shaders with this CL. See spec ESSL 3.10, section 4.4.4, page 58 for more info. dEQP-GLES31.functional.ubo.* still can't completely pass as the missing of arrays-of-arrays feature. Neither can dEQP-GLES31.functional.layout_binding.ubo.* due to the incomplete implementation of program interface APIs. TEST=angle_end2end_tests:UniformBufferTest BUG=angleproject:1442 Change-Id: If95d468fc109834a132b9b817730d3fdc3a615da Reviewed-on: https://chromium-review.googlesource.com/483848 Commit-Queue: Jie A Chen <jie.a.chen@intel.com> Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org>

  • src/libANGLE/Uniform.cpp
  • //
    // Copyright (c) 2010-2013 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/utilities.h"
    
    #include <cstring>
    
    namespace gl
    {
    
    LinkedUniform::LinkedUniform()
        : blockIndex(-1), blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo())
    {
    }
    
    LinkedUniform::LinkedUniform(GLenum typeIn,
                                 GLenum precisionIn,
                                 const std::string &nameIn,
                                 unsigned int arraySizeIn,
                                 const int bindingIn,
                                 const int locationIn,
                                 const int blockIndexIn,
                                 const sh::BlockMemberInfo &blockInfoIn)
        : blockIndex(blockIndexIn), blockInfo(blockInfoIn)
    {
        type      = typeIn;
        precision = precisionIn;
        name      = nameIn;
        arraySize = arraySizeIn;
        binding   = bindingIn;
        location  = locationIn;
    }
    
    LinkedUniform::LinkedUniform(const sh::Uniform &uniform)
        : sh::Uniform(uniform), blockIndex(-1), blockInfo(sh::BlockMemberInfo::getDefaultBlockInfo())
    {
    }
    
    LinkedUniform::LinkedUniform(const LinkedUniform &uniform)
        : sh::Uniform(uniform), blockIndex(uniform.blockIndex), blockInfo(uniform.blockInfo)
    {
        // This function is not intended to be called during runtime.
        ASSERT(uniform.mLazyData.empty());
    }
    
    LinkedUniform &LinkedUniform::operator=(const LinkedUniform &uniform)
    {
        // This function is not intended to be called during runtime.
        ASSERT(uniform.mLazyData.empty());
    
        sh::Uniform::operator=(uniform);
        blockIndex           = uniform.blockIndex;
        blockInfo            = uniform.blockInfo;
    
        return *this;
    }
    
    LinkedUniform::~LinkedUniform()
    {
    }
    
    bool LinkedUniform::isInDefaultBlock() const
    {
        return blockIndex == -1;
    }
    
    size_t LinkedUniform::dataSize() const
    {
        ASSERT(type != GL_STRUCT_ANGLEX);
        if (mLazyData.empty())
        {
            mLazyData.resize(VariableExternalSize(type) * elementCount());
            ASSERT(!mLazyData.empty());
        }
    
        return mLazyData.size();
    }
    
    uint8_t *LinkedUniform::data()
    {
        if (mLazyData.empty())
        {
            // dataSize() will init the data store.
            size_t size = dataSize();
            memset(mLazyData.data(), 0, size);
        }
    
        return mLazyData.data();
    }
    
    const uint8_t *LinkedUniform::data() const
    {
        return const_cast<LinkedUniform *>(this)->data();
    }
    
    bool LinkedUniform::isSampler() const
    {
        return IsSamplerType(type);
    }
    
    bool LinkedUniform::isImage() const
    {
        return IsImageType(type);
    }
    
    bool LinkedUniform::isField() const
    {
        return name.find('.') != std::string::npos;
    }
    
    size_t LinkedUniform::getElementSize() const
    {
        return VariableExternalSize(type);
    }
    
    size_t LinkedUniform::getElementComponents() const
    {
        return VariableComponentCount(type);
    }
    
    uint8_t *LinkedUniform::getDataPtrToElement(size_t elementIndex)
    {
        ASSERT((!isArray() && elementIndex == 0) || (isArray() && elementIndex < arraySize));
        return data() + (elementIndex > 0 ? (getElementSize() * elementIndex) : 0u);
    }
    
    const uint8_t *LinkedUniform::getDataPtrToElement(size_t elementIndex) const
    {
        return const_cast<LinkedUniform *>(this)->getDataPtrToElement(elementIndex);
    }
    
    UniformBlock::UniformBlock()
        : isArray(false),
          arrayElement(0),
          binding(0),
          dataSize(0),
          vertexStaticUse(false),
          fragmentStaticUse(false),
          computeStaticUse(false)
    {
    }
    
    UniformBlock::UniformBlock(const std::string &nameIn,
                               bool isArrayIn,
                               unsigned int arrayElementIn,
                               int bindingIn)
        : name(nameIn),
          isArray(isArrayIn),
          arrayElement(arrayElementIn),
          binding(bindingIn),
          dataSize(0),
          vertexStaticUse(false),
          fragmentStaticUse(false),
          computeStaticUse(false)
    {
    }
    
    std::string UniformBlock::nameWithArrayIndex() const
    {
        std::stringstream fullNameStr;
        fullNameStr << name;
        if (isArray)
        {
            fullNameStr << "[" << arrayElement << "]";
        }
    
        return fullNameStr.str();
    }
    }