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

significantly reduced memory usage when using Client Vertex Arrays.

Browse source
This commit is contained in:
rachytski 2011-11-25 00:08:08 +04:00 • committed by Alex Zolotarev
parent 886dbded2e
commit e9c0ebeb43
7 changed files with 96 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yg/blitter.cpp
View file

@ -150,6 +150,9 @@ namespace yg
// /// This call is necessary to avoid parasite blitting in updateActualTarget() on IPhone.
// OGLCHECK(glFinish());
storage.m_vertices->discard();
storage.m_indices->discard();
resourceManager()->multiBlitStorages()->Free(storage);
}
@ -357,6 +360,9 @@ namespace yg
// /// This call is necessary to avoid parasite blitting in updateActualTarget() on IPhone.
// OGLCHECK(glFinish());
blitStorage.m_vertices->discard();
blitStorage.m_indices->discard();
m_resourceManager->blitStorages()->Free(blitStorage);
}
}

25
yg/geometry_batcher.cpp
View file

@ -336,10 +336,27 @@ namespace yg
{
GeometryPipeline & pipeline = m_pipelines[pipelineID];
Storage storage = pipeline.m_storage;
shared_ptr<UnlockStorage> command(new UnlockStorage());
command->m_storage = storage;
command->m_storage = pipeline.m_storage;
processCommand(command);
}
void GeometryBatcher::DiscardStorage::perform()
{
if (isDebugging())
LOG(LINFO, ("performing DiscardStorage command"));
m_storage.m_vertices->discard();
m_storage.m_indices->discard();
}
void GeometryBatcher::discardPipeline(int pipelineID)
{
GeometryPipeline & pipeline = m_pipelines[pipelineID];
shared_ptr<DiscardStorage> command(new DiscardStorage());
command->m_storage = pipeline.m_storage;
processCommand(command);
}
@ -361,6 +378,8 @@ namespace yg
pipeline.m_storage.m_indices,
pipeline.m_currentIndex);
discardPipeline(pipelineID);
if (isDebugging())
{

8
yg/geometry_batcher.hpp
View file

@ -107,6 +107,13 @@ namespace yg
void perform();
};
struct DiscardStorage : public Command
{
Storage m_storage;
void perform();
};
public:
/// INTERNAL API! USE WITH CAUTION
@ -135,6 +142,7 @@ namespace yg
void flushPipeline(shared_ptr<SkinPage> const & skinPage, int pipelineID);
void unlockPipeline(int pipelineID);
void discardPipeline(int pipelineID);
public:

28
yg/indexbuffer.cpp
View file

@ -1,6 +1,7 @@
#include "../base/SRC_FIRST.hpp"
#include "../base/logging.hpp"
#include "../base/assert.hpp"
#include "../base/shared_buffer_manager.hpp"
#include "internal/opengl.hpp"
@ -40,14 +41,10 @@ namespace yg
ASSERT(!m_isLocked, ());
if (size != m_size)
{
discard();
m_size = size;
makeCurrent();
if (m_useVA)
{
delete [] (unsigned char*) m_gpuData;
m_gpuData = new unsigned char[size];
}
else
if (!m_useVA)
OGLCHECK(glBufferData(GL_ELEMENT_ARRAY_BUFFER, m_size, 0, GL_DYNAMIC_DRAW));
}
}
@ -80,7 +77,13 @@ namespace yg
m_isLocked = true;
if (m_useVA)
{
if (!m_sharedBuffer)
m_sharedBuffer = SharedBufferManager::instance().reserveSharedBuffer(m_size);
m_gpuData = &m_sharedBuffer->at(0);
return m_gpuData;
}
makeCurrent();
@ -115,6 +118,19 @@ namespace yg
m_gpuData = 0;
}
void IndexBuffer::discard()
{
if (m_useVA)
{
if (m_sharedBuffer)
{
SharedBufferManager::instance().freeSharedBuffer(m_size, m_sharedBuffer);
m_sharedBuffer.reset();
m_gpuData = 0;
}
}
}
void IndexBuffer::makeCurrent()
{
if (m_useVA)

6
yg/indexbuffer.hpp
View file

@ -1,5 +1,8 @@
#pragma once
#include "../std/vector.hpp"
#include "../std/shared_ptr.hpp"
namespace yg
{
namespace gl
@ -13,6 +16,7 @@ namespace yg
void * m_gpuData;
bool m_useVA;
bool m_isLocked;
shared_ptr<vector<unsigned char> > m_sharedBuffer;
public:
@ -24,8 +28,10 @@ namespace yg
size_t size() const;
void makeCurrent();
void * lock();
void unlock();
void discard();
void * glPtr();
void * data();

37
yg/vertexbuffer.cpp
View file

@ -1,5 +1,6 @@
#include "../base/SRC_FIRST.hpp"
#include "../base/logging.hpp"
#include "../base/shared_buffer_manager.hpp"
#include "../base/assert.hpp"
#include "internal/opengl.hpp"
@ -38,16 +39,14 @@ namespace yg
void VertexBuffer::resize(size_t size)
{
ASSERT(!m_isLocked, ());
if (size != m_size)
{
discard();
m_size = size;
makeCurrent();
if (m_useVA)
{
delete [] (unsigned char*)m_gpuData;
m_gpuData = new unsigned char [size];
}
else
if (!m_useVA)
OGLCHECK(glBufferData(GL_ARRAY_BUFFER, m_size, 0, GL_DYNAMIC_DRAW));
}
}
@ -59,11 +58,8 @@ namespace yg
VertexBuffer::~VertexBuffer()
{
if (m_useVA)
delete [] (unsigned char*)m_gpuData;
else
if (g_doDeleteOnDestroy)
OGLCHECK(glDeleteBuffers(1, &m_id));
if ((!m_useVA) && (g_doDeleteOnDestroy))
OGLCHECK(glDeleteBuffers(1, &m_id));
}
void * VertexBuffer::data()
@ -78,7 +74,13 @@ namespace yg
m_isLocked = true;
if (m_useVA)
{
if (!m_sharedBuffer)
m_sharedBuffer = SharedBufferManager::instance().reserveSharedBuffer(m_size);
m_gpuData = &m_sharedBuffer->at(0);
return m_gpuData;
}
makeCurrent();
@ -113,6 +115,19 @@ namespace yg
m_gpuData = 0;
}
void VertexBuffer::discard()
{
if (m_useVA)
{
if (m_sharedBuffer)
{
SharedBufferManager::instance().freeSharedBuffer(m_size, m_sharedBuffer);
m_sharedBuffer.reset();
m_gpuData = 0;
}
}
}
void * VertexBuffer::glPtr()
{
if (m_useVA)

6
yg/vertexbuffer.hpp
View file

@ -1,5 +1,8 @@
#pragma once
#include "../std/vector.hpp"
#include "../std/shared_ptr.hpp"
namespace yg
{
namespace gl
@ -12,6 +15,8 @@ namespace yg
unsigned int m_size;
void * m_gpuData;
shared_ptr<vector<unsigned char> > m_sharedBuffer;
/// using VA instead of buffer objects on some old GPU's
bool m_useVA;
bool m_isLocked;
@ -28,6 +33,7 @@ namespace yg
void makeCurrent();
void * lock();
void unlock();
void discard();
void * glPtr();
void * data();
bool isLocked() const;