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

• Show log

  Commit

• Hash : cc7bbafa
  Author :
  Date : 2015-07-21T15:14:10
  

  ES3: Fix off-by-one max enabled attrib.
  
  In some cases we would have a 'max enabled' attrib that was checked
  incorrectly, and this could lead to edge cases which crash when we
  have a vertex attribute and buffer both NULL.
  
  BUG=angleproject:1081
  TEST=dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array
  
  Change-Id: I62a9fa79f38340c99a708e54751d2b67dd4b6c1f
  Reviewed-on: https://chromium-review.googlesource.com/286854
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Tested-by: Jamie Madill <jmadill@chromium.org>
  

Download

• src/libANGLE/VertexArray.cpp

• //
  // Copyright (c) 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.
  //
  // Implementation of the state class for mananging GLES 3 Vertex Array Objects.
  //
  
  #include "libANGLE/VertexArray.h"
  #include "libANGLE/Buffer.h"
  #include "libANGLE/renderer/ImplFactory.h"
  #include "libANGLE/renderer/VertexArrayImpl.h"
  
  namespace gl
  {
  
  VertexArray::Data::Data(size_t maxAttribs)
      : mVertexAttributes(maxAttribs),
        mMaxEnabledAttribute(0)
  {
  }
  
  VertexArray::Data::~Data()
  {
      for (size_t i = 0; i < getMaxAttribs(); i++)
      {
          mVertexAttributes[i].buffer.set(nullptr);
      }
      mElementArrayBuffer.set(nullptr);
  }
  
  VertexArray::VertexArray(rx::ImplFactory *factory, GLuint id, size_t maxAttribs)
      : mId(id),
        mVertexArray(factory->createVertexArray(mData)),
        mData(maxAttribs)
  {
      ASSERT(mVertexArray != nullptr);
  }
  
  VertexArray::~VertexArray()
  {
      SafeDelete(mVertexArray);
  }
  
  GLuint VertexArray::id() const
  {
      return mId;
  }
  
  void VertexArray::detachBuffer(GLuint bufferName)
  {
      for (size_t attribute = 0; attribute < getMaxAttribs(); attribute++)
      {
          if (mData.mVertexAttributes[attribute].buffer.id() == bufferName)
          {
              mData.mVertexAttributes[attribute].buffer.set(nullptr);
              mVertexArray->setAttribute(attribute, mData.mVertexAttributes[attribute]);
          }
      }
  
      if (mData.mElementArrayBuffer.id() == bufferName)
      {
          mData.mElementArrayBuffer.set(nullptr);
          mVertexArray->setElementArrayBuffer(nullptr);
      }
  }
  
  const VertexAttribute &VertexArray::getVertexAttribute(size_t attributeIndex) const
  {
      ASSERT(attributeIndex < getMaxAttribs());
      return mData.mVertexAttributes[attributeIndex];
  }
  
  void VertexArray::setVertexAttribDivisor(size_t index, GLuint divisor)
  {
      ASSERT(index < getMaxAttribs());
      mData.mVertexAttributes[index].divisor = divisor;
      mVertexArray->setAttributeDivisor(index, divisor);
  }
  
  void VertexArray::enableAttribute(size_t attributeIndex, bool enabledState)
  {
      ASSERT(attributeIndex < getMaxAttribs());
      mData.mVertexAttributes[attributeIndex].enabled = enabledState;
      mVertexArray->enableAttribute(attributeIndex, enabledState);
  
      // Update state cache
      if (enabledState)
      {
          mData.mMaxEnabledAttribute = std::max(attributeIndex + 1, mData.mMaxEnabledAttribute);
      }
      else if (mData.mMaxEnabledAttribute == attributeIndex + 1)
      {
          while (mData.mMaxEnabledAttribute > 0 &&
                 !mData.mVertexAttributes[mData.mMaxEnabledAttribute - 1].enabled)
          {
              --mData.mMaxEnabledAttribute;
          }
      }
  }
  
  void VertexArray::setAttributeState(size_t attributeIndex, gl::Buffer *boundBuffer, GLint size, GLenum type,
                                      bool normalized, bool pureInteger, GLsizei stride, const void *pointer)
  {
      ASSERT(attributeIndex < getMaxAttribs());
  
      VertexAttribute *attrib = &mData.mVertexAttributes[attributeIndex];
  
      attrib->buffer.set(boundBuffer);
      attrib->size = size;
      attrib->type = type;
      attrib->normalized = normalized;
      attrib->pureInteger = pureInteger;
      attrib->stride = stride;
      attrib->pointer = pointer;
  
      mVertexArray->setAttribute(attributeIndex, *attrib);
  }
  
  void VertexArray::setElementArrayBuffer(Buffer *buffer)
  {
      mData.mElementArrayBuffer.set(buffer);
      mVertexArray->setElementArrayBuffer(buffer);
  }
  
  }
  

Download