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

removed dynamic texture randomizing upon allocation in _DEBUG mode. fixed BaseTexture::id return value.

Browse source
This commit is contained in:
rachytski 2011-07-26 21:11:15 +03:00 • committed by Alex Zolotarev
parent dee5dc3e71
commit 9279d8c3a7
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yg/base_texture.cpp
View file

@ -77,7 +77,7 @@ namespace yg
OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
}
int BaseTexture::id() const
unsigned BaseTexture::id() const
{
return m_id;
}

2
yg/base_texture.hpp
View file

@ -32,7 +32,7 @@ namespace yg
unsigned width() const;
unsigned height() const;
int id() const;
unsigned id() const;
void makeCurrent();
void attachToFrameBuffer();

6
yg/resource_manager.cpp
View file

@ -64,9 +64,6 @@ namespace yg
{
shared_ptr<gl::BaseTexture> t(new TDynamicTexture(dynamicTexWidth, dynamicTexHeight));
m_dynamicTextures.PushBack(t);
#ifdef DEBUG
static_cast<TDynamicTexture*>(t.get())->randomize();
#endif
}
LOG(LINFO, ("allocating ", dynamicTexWidth * dynamicTexHeight * sizeof(TDynamicTexture::pixel_t), " bytes for textures"));
@ -75,9 +72,6 @@ namespace yg
{
shared_ptr<gl::BaseTexture> t(new TDynamicTexture(fontTexWidth, fontTexHeight));
m_fontTextures.PushBack(t);
#ifdef DEBUG
static_cast<TDynamicTexture*>(t.get())->randomize();
#endif
}
LOG(LINFO, ("allocating ", fontTexWidth * fontTexHeight * sizeof(TDynamicTexture::pixel_t), " bytes for font textures"));