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

drape_tests fix

Browse source
This commit is contained in:
ExMix 2014-07-07 10:16:29 +02:00 • committed by Alex Zolotarev
parent f28b92831d
commit e8a151be56
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drape/drape_tests/batcher_tests.cpp
View file

@ -143,13 +143,10 @@ UNIT_TEST(BatchLists_Test)
EXPECTGL(glEnableVertexAttribute(1));
EXPECTGL(glVertexAttributePointer(1, 3, gl_const::GLFloatType, false, 0, 0));
// bind index buffer
EXPECTGL(glBindBuffer(IndexBufferID, gl_const::GLElementArrayBuffer));
// delete bucket
EXPECTGL(glDeleteBuffer(IndexBufferID));
EXPECTGL(glDeleteBuffer(DataBufferID));
EXPECTGL(glDeleteVertexArray(3));
EXPECTGL(glDeleteBuffer(_));
EXPECTGL(glDeleteBuffer(_));
EXPECTGL(glDeleteVertexArray(VaoID));
EXPECTGL(glUseProgram(0));
EXPECTGL(glDeleteProgram(ProgramID));
}

1
drape/gpu_buffer.cpp
View file

@ -16,7 +16,6 @@ GPUBuffer::GPUBuffer(Target t, uint8_t elementSize, uint16_t capacity)
, m_t(t)
{
m_bufferID = GLFunctions::glGenBuffer();
Bind();
Resize(capacity);
}

2
drape/vertex_array_buffer.cpp
View file

@ -16,7 +16,7 @@ VertexArrayBuffer::VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBuff
VertexArrayBuffer::~VertexArrayBuffer()
{
m_indexBuffer.Destroy();
(void)GetRangeDeletor(m_buffers, MasterPointerDeleter())();
DeleteRange(m_buffers, MasterPointerDeleter());
if (m_VAO != 0)
{