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

[android] Removed unneeded ifdefs

Browse source
This commit is contained in:
Alex Zolotarev 2012-01-13 01:46:31 +03:00 • committed by Alex Zolotarev
parent 56867bb514
commit 3e7499b62f
5 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yg/base_texture.cpp
View file

@ -66,10 +66,8 @@ namespace yg
void BaseTexture::makeCurrent() const
{
#ifndef OMIM_OS_ANDROID
if (current() != m_id)
#endif
OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
}
unsigned BaseTexture::id() const

2
yg/framebuffer.cpp
View file

@ -38,9 +38,7 @@ namespace yg
void FrameBuffer::makeCurrent()
{
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
OGLCHECK(glBindFramebufferFn(GL_FRAMEBUFFER_MWM, m_id));
if (m_renderTarget)

2
yg/indexbuffer.cpp
View file

@ -129,9 +129,7 @@ namespace yg
if (m_useVA)
return;
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
OGLCHECK(glBindBufferFn(GL_ELEMENT_ARRAY_BUFFER, m_id));
}

4
yg/renderbuffer.cpp
View file

@ -95,10 +95,8 @@ namespace yg
void RenderBuffer::makeCurrent() const
{
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
OGLCHECK(glBindRenderbufferFn(GL_RENDERBUFFER_MWM, m_id));
OGLCHECK(glBindRenderbufferFn(GL_RENDERBUFFER_MWM, m_id));
}
bool RenderBuffer::isDepthBuffer() const

2
yg/vertexbuffer.cpp
View file

@ -140,9 +140,7 @@ namespace yg
if (m_useVA)
return;
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
OGLCHECK(glBindBufferFn(GL_ARRAY_BUFFER, m_id));
}