Revert "Store the applied element array buffer as a binding pointer."
This reverts commit 0018c85ea45090b5de61d4be1fbfbf96a3cde48b.
Change-Id: Ieab61c0a4cd1b24d606263e9bf2bae31ea2e8ac4
Reviewed-on: https://chromium-review.googlesource.com/289486
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/VertexArray.cpp b/src/libANGLE/VertexArray.cpp
index 3489a31..2992b44 100644
--- a/src/libANGLE/VertexArray.cpp
+++ b/src/libANGLE/VertexArray.cpp
@@ -54,12 +54,14 @@
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);
}
}
@@ -73,12 +75,14 @@
{
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)
@@ -109,11 +113,14 @@
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);
}
}
diff --git a/src/libANGLE/renderer/VertexArrayImpl.h b/src/libANGLE/renderer/VertexArrayImpl.h
index 8381676..a5e4d1b 100644
--- a/src/libANGLE/renderer/VertexArrayImpl.h
+++ b/src/libANGLE/renderer/VertexArrayImpl.h
@@ -22,6 +22,11 @@
VertexArrayImpl(const gl::VertexArray::Data &data) : mData(data) { }
virtual ~VertexArrayImpl() { }
+ virtual void setElementArrayBuffer(const gl::Buffer *buffer) = 0;
+ virtual void setAttribute(size_t idx, const gl::VertexAttribute &attr) = 0;
+ virtual void setAttributeDivisor(size_t idx, GLuint divisor) = 0;
+ virtual void enableAttribute(size_t idx, bool enabledState) = 0;
+
protected:
const gl::VertexArray::Data &mData;
};
diff --git a/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h b/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
index b397140..ac12bf4 100644
--- a/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
+++ b/src/libANGLE/renderer/d3d/d3d11/VertexArray11.h
@@ -23,7 +23,12 @@
: VertexArrayImpl(data)
{
}
- virtual ~VertexArray11() {}
+ virtual ~VertexArray11() { }
+
+ virtual void setElementArrayBuffer(const gl::Buffer *buffer) { }
+ virtual void setAttribute(size_t idx, const gl::VertexAttribute &attr) { }
+ virtual void setAttributeDivisor(size_t idx, GLuint divisor) { }
+ virtual void enableAttribute(size_t idx, bool enabledState) { }
};
}
diff --git a/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h b/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
index 9922017..21db8c5 100644
--- a/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
+++ b/src/libANGLE/renderer/d3d/d3d9/VertexArray9.h
@@ -25,6 +25,11 @@
}
virtual ~VertexArray9() { }
+
+ virtual void setElementArrayBuffer(const gl::Buffer *buffer) { }
+ virtual void setAttribute(size_t idx, const gl::VertexAttribute &attr) { }
+ virtual void setAttributeDivisor(size_t idx, GLuint divisor) { }
+ virtual void enableAttribute(size_t idx, bool enabledState) { }
};
}
diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
index 84722a4..f345ab1 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -26,7 +26,7 @@
mFunctions(functions),
mStateManager(stateManager),
mVertexArrayID(0),
- mAppliedElementArrayBuffer(),
+ mAppliedElementArrayBuffer(0),
mStreamingElementArrayBufferSize(0),
mStreamingElementArrayBuffer(0),
mStreamingArrayBufferSize(0),
@@ -55,13 +55,34 @@
mStreamingArrayBufferSize = 0;
mStreamingArrayBuffer = 0;
- mAppliedElementArrayBuffer.set(nullptr);
for (size_t idx = 0; idx < mAppliedAttributes.size(); idx++)
{
mAppliedAttributes[idx].buffer.set(nullptr);
}
}
+void VertexArrayGL::setElementArrayBuffer(const gl::Buffer *buffer)
+{
+ // If the buffer is being unbound/deleted, reset the currently applied buffer ID
+ // so that even if a new buffer is generated with the same ID, it will be re-bound.
+ if (buffer == nullptr && mAppliedElementArrayBuffer != mStreamingElementArrayBuffer)
+ {
+ mAppliedElementArrayBuffer = 0;
+ }
+}
+
+void VertexArrayGL::setAttribute(size_t idx, const gl::VertexAttribute &attr)
+{
+}
+
+void VertexArrayGL::setAttributeDivisor(size_t idx, GLuint divisor)
+{
+}
+
+void VertexArrayGL::enableAttribute(size_t idx, bool enabledState)
+{
+}
+
gl::Error VertexArrayGL::syncDrawArraysState(const std::vector<GLuint> &activeAttribLocations, GLint first, GLsizei count) const
{
return syncDrawState(activeAttribLocations, first, count, GL_NONE, nullptr, nullptr);
@@ -75,7 +96,7 @@
gl::Error VertexArrayGL::syncDrawState(const std::vector<GLuint> &activeAttribLocations, GLint first, GLsizei count, GLenum type, const GLvoid *indices, const GLvoid **outIndices) const
{
- mStateManager->bindVertexArray(mVertexArrayID, getAppliedElementArrayBufferID());
+ mStateManager->bindVertexArray(mVertexArrayID, mAppliedElementArrayBuffer);
// Check if any attributes need to be streamed, determines if the index range needs to be computed
bool attributesNeedStreaming = doAttributesNeedStreaming(activeAttribLocations);
@@ -229,11 +250,12 @@
// Need to check the range of indices if attributes need to be streamed
if (elementArrayBuffer != nullptr)
{
- if (elementArrayBuffer != mAppliedElementArrayBuffer.get())
+ const BufferGL *bufferGL = GetImplAs<BufferGL>(elementArrayBuffer);
+ GLuint elementArrayBufferID = bufferGL->getBufferID();
+ if (elementArrayBufferID != mAppliedElementArrayBuffer)
{
- const BufferGL *bufferGL = GetImplAs<BufferGL>(elementArrayBuffer);
- mStateManager->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, bufferGL->getBufferID());
- mAppliedElementArrayBuffer.set(elementArrayBuffer);
+ mStateManager->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementArrayBufferID);
+ mAppliedElementArrayBuffer = elementArrayBufferID;
}
// Only compute the index range if the attributes also need to be streamed
@@ -269,7 +291,7 @@
}
mStateManager->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, mStreamingElementArrayBuffer);
- mAppliedElementArrayBuffer.set(nullptr);
+ mAppliedElementArrayBuffer = mStreamingElementArrayBuffer;
// Make sure the element array buffer is large enough
const gl::Type &indexTypeInfo = gl::GetTypeInfo(type);
@@ -392,8 +414,7 @@
GLuint VertexArrayGL::getAppliedElementArrayBufferID() const
{
- return mAppliedElementArrayBuffer.get() == nullptr ? mStreamingElementArrayBuffer
- : mAppliedElementArrayBuffer.id();
+ return mAppliedElementArrayBuffer;
}
}
diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.h b/src/libANGLE/renderer/gl/VertexArrayGL.h
index f277bdb..85bd6fb 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.h
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.h
@@ -23,6 +23,11 @@
VertexArrayGL(const gl::VertexArray::Data &data, const FunctionsGL *functions, StateManagerGL *stateManager);
~VertexArrayGL() override;
+ void setElementArrayBuffer(const gl::Buffer *buffer) override;
+ void setAttribute(size_t idx, const gl::VertexAttribute &attr) override;
+ void setAttributeDivisor(size_t idx, GLuint divisor) override;
+ void enableAttribute(size_t idx, bool enabledState) override;
+
gl::Error syncDrawArraysState(const std::vector<GLuint> &activeAttribLoations, GLint first, GLsizei count) const;
gl::Error syncDrawElementsState(const std::vector<GLuint> &activeAttribLoations, GLsizei count, GLenum type,
const GLvoid *indices, const GLvoid **outIndices) const;
@@ -56,7 +61,7 @@
GLuint mVertexArrayID;
- mutable BindingPointer<gl::Buffer> mAppliedElementArrayBuffer;
+ mutable GLuint mAppliedElementArrayBuffer;
mutable std::vector<gl::VertexAttribute> mAppliedAttributes;
mutable size_t mStreamingElementArrayBufferSize;