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

Fixed crash on GPU buffer mapping.

Browse source
This commit is contained in:
Daria Volvenkova 2016-04-06 13:49:28 +03:00 • committed by Alex Zolotarev
parent 4939196bc7
commit a7cfa6f5ba
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drape/vertex_array_buffer.cpp
View file

@ -78,7 +78,7 @@ 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. In Bind method have ASSERT("bind already called")
/// and we need only bind VAO.
if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
Bind();
else
@ -230,6 +230,11 @@ void VertexArrayBuffer::UploadIndexes(void const * data, uint32_t count)
void VertexArrayBuffer::ApplyMutation(ref_ptr<IndexBufferMutator> indexMutator,
ref_ptr<AttributeBufferMutator> attrMutator)
{
/// If OES_vertex_array_object is supported than we need to bind current VAO before call glBindBuffer,
/// otherwise we could affect previously binded VAO.
if (GLExtensionsList::Instance().IsSupported(GLExtensionsList::VertexArrayObject))
Bind();
if (indexMutator != nullptr)
{
ASSERT(m_indexBuffer != nullptr, ());