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

lazy initialization of OpenGL resources(texture and render buffer).

Browse source
This commit is contained in:
rachytski 2011-11-09 14:58:17 +04:00 • committed by Alex Zolotarev
parent b745266831
commit 6702d47993
5 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
yg/base_texture.cpp
View file

@ -11,8 +11,11 @@ namespace yg
{
void BaseTexture::checkID() const
{
if (m_id == -1)
if (!m_hasID)
{
m_hasID = true;
init();
}
}
void BaseTexture::init() const
@ -28,20 +31,20 @@ namespace yg
}
BaseTexture::BaseTexture(m2::PointU const & size)
: m_width(size.x), m_height(size.y), m_id(-1)
: m_width(size.x), m_height(size.y), m_id(0), m_hasID(false)
{
// init();
}
BaseTexture::BaseTexture(unsigned width, unsigned height)
: m_width(width), m_height(height), m_id(-1)
: m_width(width), m_height(height), m_id(0), m_hasID(false)
{
// init();
}
BaseTexture::~BaseTexture()
{
if (m_id != -1)
if (m_hasID)
OGLCHECK(glDeleteTextures(1, &m_id));
}
@ -84,6 +87,7 @@ namespace yg
unsigned BaseTexture::id() const
{
checkID();
return m_id;
}

1
yg/base_texture.hpp
View file

@ -15,6 +15,7 @@ namespace yg
/// OpenGL texture ID
mutable unsigned m_id;
mutable bool m_hasID;
/// texture dimensions
/// @{
unsigned m_width;

1
yg/render_target.hpp
View file

@ -9,6 +9,7 @@ namespace yg
public:
virtual ~RenderTarget() {}
/// attach render target to framebuffer and setup coordinate system
virtual unsigned int id() const = 0;
virtual void attachToFrameBuffer() = 0;
virtual unsigned width() const = 0;
virtual unsigned height() const = 0;

7
yg/renderbuffer.cpp
View file

@ -27,8 +27,9 @@ namespace yg
void RenderBuffer::checkID() const
{
if (m_id == -1)
if (!m_hasID)
{
m_hasID = true;
#ifdef OMIM_GL_ES
OGLCHECK(glGenRenderbuffersOES(1, &m_id));
makeCurrent();
@ -57,12 +58,12 @@ namespace yg
}
RenderBuffer::RenderBuffer(size_t width, size_t height, bool isDepthBuffer)
: m_isDepthBuffer(isDepthBuffer), m_width(width), m_height(height), m_id(-1)
: m_isDepthBuffer(isDepthBuffer), m_width(width), m_height(height), m_hasID(false), m_id(0)
{}
RenderBuffer::~RenderBuffer()
{
if (m_id != -1)
if (m_hasID)
{
#ifdef OMIM_GL_ES
OGLCHECK(glDeleteRenderbuffersOES(1, &m_id));

1
yg/renderbuffer.hpp
View file

@ -11,6 +11,7 @@ namespace yg
{
private:
mutable bool m_hasID;
mutable unsigned int m_id;
bool m_isDepthBuffer;