pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Unbind VAO after each binding.

Browse source
This commit is contained in:
Daria Volvenkova 2016-05-06 13:31:23 +03:00 • committed by Vladimir Byko-Ianko
parent 91a2089542
commit d55bc5d652
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drape/vertex_array_buffer.cpp
View file

@ -79,14 +79,14 @@ void VertexArrayBuffer::RenderRange(IndicesRange const & range)
ASSERT(m_program != nullptr, ("Somebody not call Build. It's very bad. Very very bad"));
/// if OES_vertex_array_object is supported than all bindings already saved in VAO
/// and we need only bind VAO.
if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
Bind();
else
if (!Bind())
BindStaticBuffers();
BindDynamicBuffers();
GetIndexBuffer()->Bind();
GLFunctions::glDrawElements(dp::IndexStorage::SizeOfIndex(), range.m_idxCount, range.m_idxStart);
Unbind();
}
}
@ -111,6 +111,7 @@ void VertexArrayBuffer::Build(ref_ptr<GpuProgram> program)
m_VAO = GLFunctions::glGenVertexArray();
Bind();
BindStaticBuffers();
Unbind();
}
void VertexArrayBuffer::UploadData(BindingInfo const & bindingInfo, void const * data, uint32_t count)
@ -232,8 +233,7 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
{
/// We need to bind current VAO before calling glBindBuffer if OES_vertex_array_object is supported.
/// Otherwise we risk affecting a previously binded VAO.
if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
Bind();
Bind();
if (indexMutator != nullptr)
{
@ -247,7 +247,10 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
}
if (attrMutator == nullptr)
{
Unbind();
return;
}
typedef AttributeBufferMutator::TMutateData TMutateData;
typedef AttributeBufferMutator::TMutateNodes TMutateNodes;
@ -266,12 +269,25 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
mapper.UpdateData(node.m_data.get(), node.m_region.m_offset, node.m_region.m_count);
}
}
Unbind();
}
void VertexArrayBuffer::Bind() const
bool VertexArrayBuffer::Bind() const
{
ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render"));
GLFunctions::glBindVertexArray(m_VAO);
if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
{
GLFunctions::glBindVertexArray(m_VAO);
return true;
}
return false;
}
void VertexArrayBuffer::Unbind() const
{
if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
GLFunctions::glBindVertexArray(0);
}
void VertexArrayBuffer::BindStaticBuffers() const

3
drape/vertex_array_buffer.hpp
View file

@ -76,7 +76,8 @@ private:
ref_ptr<DataBuffer> GetOrCreateBuffer(BindingInfo const & bindingInfo, bool isDynamic);
ref_ptr<DataBuffer> GetBuffer(BindingInfo const & bindingInfo, bool isDynamic) const;
void Bind() const;
bool Bind() const;
void Unbind() const;
void BindStaticBuffers() const;
void BindDynamicBuffers() const;
void BindBuffers(TBuffersMap const & buffers) const;