Proliferate gl::Context everywhere.
This gives the D3D back-end access to the GL state almost anywhere.
This uses the onDestroy hook for Textures to push errors up from
destructors, although they still don't quite make it to the Context.
There are places, such as in EGL object (Context/Surface) destruction,
where we end up calling through to GL implementation internals without
having access to a gl::Context. We handle this via a proxy Context
to a Display, basically a null context, that has access to impl-side
state like the Renderer pointer if necessary. It does not have access
to the normal GL state.
Also Pass gl::Context to RefCountObject::release(). Since we're using
destroy() methods now, we should not ever call the destructor directly.
BUG=angleproject:1156
Change-Id: Ie4c32ad6bf6caaff0289901f30b5c6bafa2ce259
Reviewed-on: https://chromium-review.googlesource.com/529707
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
index 86252a7..afd1476 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -76,7 +76,7 @@
}
}
-VertexArrayGL::~VertexArrayGL()
+void VertexArrayGL::destroy(const gl::Context *context)
{
mStateManager->deleteVertexArray(mVertexArrayID);
mVertexArrayID = 0;
@@ -89,23 +89,25 @@
mStreamingArrayBufferSize = 0;
mStreamingArrayBuffer = 0;
- mAppliedElementArrayBuffer.set(nullptr);
+ mAppliedElementArrayBuffer.set(context, nullptr);
for (auto &binding : mAppliedBindings)
{
- binding.setBuffer(nullptr);
+ binding.setBuffer(context, nullptr);
}
}
-gl::Error VertexArrayGL::syncDrawArraysState(const gl::AttributesMask &activeAttributesMask,
+gl::Error VertexArrayGL::syncDrawArraysState(const gl::Context *context,
+ const gl::AttributesMask &activeAttributesMask,
GLint first,
GLsizei count,
GLsizei instanceCount) const
{
- return syncDrawState(activeAttributesMask, first, count, GL_NONE, nullptr, instanceCount, false,
- nullptr);
+ return syncDrawState(context, activeAttributesMask, first, count, GL_NONE, nullptr,
+ instanceCount, false, nullptr);
}
-gl::Error VertexArrayGL::syncDrawElementsState(const gl::AttributesMask &activeAttributesMask,
+gl::Error VertexArrayGL::syncDrawElementsState(const gl::Context *context,
+ const gl::AttributesMask &activeAttributesMask,
GLsizei count,
GLenum type,
const void *indices,
@@ -113,11 +115,11 @@
bool primitiveRestartEnabled,
const void **outIndices) const
{
- return syncDrawState(activeAttributesMask, 0, count, type, indices, instanceCount,
+ return syncDrawState(context, activeAttributesMask, 0, count, type, indices, instanceCount,
primitiveRestartEnabled, outIndices);
}
-gl::Error VertexArrayGL::syncElementArrayState() const
+gl::Error VertexArrayGL::syncElementArrayState(const gl::Context *context) const
{
gl::Buffer *elementArrayBuffer = mData.getElementArrayBuffer().get();
ASSERT(elementArrayBuffer);
@@ -125,13 +127,14 @@
{
const BufferGL *bufferGL = GetImplAs<BufferGL>(elementArrayBuffer);
mStateManager->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, bufferGL->getBufferID());
- mAppliedElementArrayBuffer.set(elementArrayBuffer);
+ mAppliedElementArrayBuffer.set(context, elementArrayBuffer);
}
return gl::NoError();
}
-gl::Error VertexArrayGL::syncDrawState(const gl::AttributesMask &activeAttributesMask,
+gl::Error VertexArrayGL::syncDrawState(const gl::Context *context,
+ const gl::AttributesMask &activeAttributesMask,
GLint first,
GLsizei count,
GLenum type,
@@ -151,12 +154,8 @@
IndexRange indexRange;
if (type != GL_NONE)
{
- Error error = syncIndexData(count, type, indices, primitiveRestartEnabled,
- attributesNeedStreaming, &indexRange, outIndices);
- if (error.isError())
- {
- return error;
- }
+ ANGLE_TRY(syncIndexData(context, count, type, indices, primitiveRestartEnabled,
+ attributesNeedStreaming, &indexRange, outIndices));
}
else
{
@@ -167,17 +166,14 @@
if (attributesNeedStreaming)
{
- Error error = streamAttributes(activeAttributesMask, instanceCount, indexRange);
- if (error.isError())
- {
- return error;
- }
+ ANGLE_TRY(streamAttributes(activeAttributesMask, instanceCount, indexRange));
}
return gl::NoError();
}
-gl::Error VertexArrayGL::syncIndexData(GLsizei count,
+gl::Error VertexArrayGL::syncIndexData(const gl::Context *context,
+ GLsizei count,
GLenum type,
const void *indices,
bool primitiveRestartEnabled,
@@ -196,7 +192,7 @@
{
const BufferGL *bufferGL = GetImplAs<BufferGL>(elementArrayBuffer);
mStateManager->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, bufferGL->getBufferID());
- mAppliedElementArrayBuffer.set(elementArrayBuffer);
+ mAppliedElementArrayBuffer.set(context, elementArrayBuffer);
}
// Only compute the index range if the attributes also need to be streamed
@@ -234,7 +230,7 @@
}
mStateManager->bindBuffer(GL_ELEMENT_ARRAY_BUFFER, mStreamingElementArrayBuffer);
- mAppliedElementArrayBuffer.set(nullptr);
+ mAppliedElementArrayBuffer.set(context, nullptr);
// Make sure the element array buffer is large enough
const Type &indexTypeInfo = GetTypeInfo(type);
@@ -447,7 +443,7 @@
mAppliedAttributes[attribIndex].enabled = enabled;
}
-void VertexArrayGL::updateAttribPointer(size_t attribIndex)
+void VertexArrayGL::updateAttribPointer(const gl::Context *context, size_t attribIndex)
{
const VertexAttribute &attrib = mData.getVertexAttribute(attribIndex);
@@ -477,7 +473,7 @@
// Mark the applied binding is using a client memory pointer by setting its buffer to
// nullptr so that if it doesn't use a client memory pointer later, there is no chance that
// the caching will skip it.
- mAppliedBindings[bindingIndex].setBuffer(nullptr);
+ mAppliedBindings[bindingIndex].setBuffer(context, nullptr);
return;
}
@@ -503,7 +499,7 @@
mAppliedBindings[bindingIndex].setStride(binding.getStride());
mAppliedBindings[bindingIndex].setOffset(binding.getOffset());
- mAppliedBindings[bindingIndex].setBuffer(binding.getBuffer().get());
+ mAppliedBindings[bindingIndex].setBuffer(context, binding.getBuffer().get());
}
void VertexArrayGL::callVertexAttribPointer(GLuint attribIndex,
@@ -563,7 +559,7 @@
else if (dirtyBit >= VertexArray::DIRTY_BIT_ATTRIB_0_POINTER &&
dirtyBit < VertexArray::DIRTY_BIT_ATTRIB_MAX_POINTER)
{
- updateAttribPointer(index);
+ updateAttribPointer(context, index);
}
else if (dirtyBit >= VertexArray::DIRTY_BIT_ATTRIB_0_FORMAT &&
dirtyBit < VertexArray::DIRTY_BIT_BINDING_MAX_BUFFER)