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

[android] Reverted temporary debug logging

Browse source
This commit is contained in:
Alex Zolotarev 2012-01-25 08:39:42 +03:00 • committed by Alex Zolotarev
parent 71443a813e
commit 7d9addb6db
6 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yg/base_texture.cpp
View file

@ -13,10 +13,8 @@ namespace yg
void BaseTexture::init() const
{
OGLCHECK(glGenTextures(1, &m_id));
LOG(LDEBUG, ("glGenTextures", m_id));
OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
LOG(LDEBUG, ("glBindTexture", m_id));
OGLCHECK(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT));
OGLCHECK(glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT));
@ -75,7 +73,6 @@ namespace yg
{
int id;
OGLCHECK(glGetIntegerv(GL_TEXTURE_BINDING_2D, &id));
LOG(LDEBUG, ("glGetIntegerv", id));
return id;
}
@ -85,10 +82,7 @@ namespace yg
queue->processFn(bind(&BaseTexture::makeCurrent, this, (yg::gl::PacketsQueue*)0));
if (current() != m_id)
{
OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
LOG(LDEBUG, ("glBindTexture", m_id));
}
}
unsigned BaseTexture::id() const

7
yg/framebuffer.cpp
View file

@ -19,7 +19,6 @@ namespace yg
{
int id;
OGLCHECK(glGetIntegerv(GL_FRAMEBUFFER_BINDING_MWM, &id));
LOG(LDEBUG, ("glGetIntegerv", id));
return id;
}
@ -28,10 +27,7 @@ namespace yg
if (defaultFB)
m_id = 0;
else
{
OGLCHECK(glGenFramebuffersFn(1, &m_id));
LOG(LDEBUG, ("glGenFramebuffers", m_id));
}
}
FrameBuffer::~FrameBuffer()
@ -43,10 +39,7 @@ namespace yg
void FrameBuffer::makeCurrent()
{
if (m_id != current())
{
OGLCHECK(glBindFramebufferFn(GL_FRAMEBUFFER_MWM, m_id));
LOG(LDEBUG, ("glBindFramebuffer", m_id));
}
if (m_depthBuffer)
m_depthBuffer->attachToFrameBuffer();

1
yg/indexbuffer.cpp
View file

@ -18,7 +18,6 @@ namespace yg
{
int id;
OGLCHECK(glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &id));
LOG(LDEBUG, ("glGetIntegerv", id));
return id;
}

7
yg/renderbuffer.cpp
View file

@ -18,7 +18,6 @@ namespace yg
{
int id;
OGLCHECK(glGetIntegerv(GL_RENDERBUFFER_BINDING_MWM, &id));
LOG(LDEBUG, ("glGetIntegerv", id));
return id;
}
@ -28,7 +27,6 @@ namespace yg
// if (!m_isDepthBuffer)
{
OGLCHECK(glGenRenderbuffersFn(1, &m_id));
LOG(LDEBUG, ("glGenRenderbuffers", m_id));
makeCurrent();
@ -39,8 +37,6 @@ namespace yg
internalFormat,
m_width,
m_height));
LOG(LDEBUG, ("glRenderbufferStorage", m_isDepthBuffer ? "GL_DEPTH_COMPONENT16_MWM" : "GL_RGBA8_MWM",
m_width, m_height));
}
/* else
{
@ -109,10 +105,7 @@ namespace yg
void RenderBuffer::makeCurrent() const
{
if (m_id != current())
{
OGLCHECK(glBindRenderbufferFn(GL_RENDERBUFFER_MWM, m_id));
LOG(LDEBUG, ("glBindRenderbuffer", m_id));
}
}
bool RenderBuffer::isDepthBuffer() const

13
yg/utils.cpp
View file

@ -14,7 +14,6 @@ namespace yg
void setupCoordinates(size_t width, size_t height, bool doSwap /*= true*/)
{
OGLCHECK(glViewport(0, 0, width, height));
LOG(LDEBUG, ("glViewport", width, height));
OGLCHECK(glMatrixMode(GL_MODELVIEW));
OGLCHECK(glLoadIdentity());
@ -24,26 +23,14 @@ namespace yg
#ifdef OMIM_GL_ES
if (!doSwap)
{
OGLCHECK(glOrthof(0, width, 0, height, -yg::maxDepth, yg::maxDepth));
LOG(LDEBUG, ("glOrthof", 0, width, 0, height, -yg::maxDepth, yg::maxDepth));
}
else
{
OGLCHECK(glOrthof(0, width, height, 0, -yg::maxDepth, yg::maxDepth));
LOG(LDEBUG, ("glOrthof", 0, width, height, 0, -yg::maxDepth, yg::maxDepth));
}
#else
if (!doSwap)
{
OGLCHECK(glOrtho(0, width, 0, height, -yg::maxDepth, yg::maxDepth));
LOG(LDEBUG, ("glOrtho", 0, width, 0, height, -yg::maxDepth, yg::maxDepth));
}
else
{
OGLCHECK(glOrtho(0, width, height, 0, -yg::maxDepth, yg::maxDepth));
LOG(LDEBUG, ("glOrtho", 0, width, height, 0, -yg::maxDepth, yg::maxDepth));
}
#endif
}
}

1
yg/vertexbuffer.cpp
View file

@ -18,7 +18,6 @@ namespace yg
{
int id;
OGLCHECK(glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &id));
LOG(LDEBUG, ("glGetIntegerv", id));
return id;
}