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

[note-3 fix] call glFlush only on iOS, where we has multithreaded opengl

Browse source
This commit is contained in:
ExMix 2013-10-22 16:00:41 +03:00 • committed by Alex Zolotarev
parent cb09516a0f
commit 96ff181779
8 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/opengl/buffer_object.cpp
View file

@ -52,7 +52,7 @@ namespace graphics
/// resource update made in one thread to the another thread is
/// to call the glFlush in thread, which modifies resource and then rebind
/// resource in another threads that is using this resource, if any.
OGLCHECK(glFlush());
OGLCHECK(glFlushFn());
}
}
}

4
graphics/opengl/geometry_renderer.cpp
View file

@ -126,7 +126,7 @@ namespace graphics
/// resource update made in one thread to the another thread is
/// to call the glFlush in thread, which modifies resource and then rebind
/// resource in another threads that is using this resource, if any.
OGLCHECK(glFlush());
OGLCHECK(glFlushFn());
static_cast<ManagedTexture*>(m_texture.get())->unlock();
}
@ -390,7 +390,7 @@ namespace graphics
/// resource update made in one thread to the another thread is
/// to call the glFlush in thread, which modifies resource and then rebind
/// resource in another threads that is using this resource, if any.
OGLCHECK(glFlush());
OGLCHECK(glFlushFn());
}
else
LOG(LDEBUG, ("no storage to unlock"));

1
graphics/opengl/gl_procedures.inl
View file

@ -2,6 +2,7 @@
// buffer objects extensions
DEFINE_GL_RPOC("glFlush", glFlushFn);
DEFINE_GL_PROC("glActiveTexture", glActiveTextureFn)
DEFINE_GL_PROC("glGetAttribLocation", glGetAttribLocationFn)
DEFINE_GL_PROC("glGetActiveAttrib", glGetActiveAttribFn)

1
graphics/opengl/opengl.cpp
View file

@ -103,6 +103,7 @@ namespace graphics
void (OPENGL_CALLING_CONVENTION * glLoadMatrixfFn) (const GLfloat *m);
void (OPENGL_CALLING_CONVENTION * glOrthoFn) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
void (OPENGL_CALLING_CONVENTION * glDrawElementsFn) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
void (OPENGL_CALLING_CONVENTION * glFlushFn)();
bool g_isBufferObjectsSupported = true;
bool g_isMapBufferSupported = true;

1
graphics/opengl/opengl.hpp
View file

@ -85,6 +85,7 @@ namespace graphics
extern void (OPENGL_CALLING_CONVENTION * glOrthoFn) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
extern void (OPENGL_CALLING_CONVENTION * glDrawElementsFn) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
extern void (OPENGL_CALLING_CONVENTION * glFlushFn)();
extern const GLenum GL_MODELVIEW_MWM;
extern const GLenum GL_PROJECTION_MWM;

14
graphics/opengl/opengl_es2.cpp
View file

@ -19,6 +19,14 @@ namespace graphics
{
namespace gl
{
#ifndef OMIM_OS_IPHONE
namespace
{
void emptyFlushFn() {}
}
#endif
const int GL_FRAMEBUFFER_BINDING_MWM = GL_FRAMEBUFFER_BINDING;
const int GL_FRAMEBUFFER_MWM = GL_FRAMEBUFFER;
const int GL_FRAMEBUFFER_UNSUPPORTED_MWM = GL_FRAMEBUFFER_UNSUPPORTED;
@ -59,6 +67,12 @@ namespace graphics
glUnmapBufferFn = &glUnmapBufferOES;
#endif
#ifdef OMIM_OS_IPHONE
glFlushFn = &glFlush;
#else
glFlushFn = &emptyFlushFn;
#endif
g_isFramebufferSupported = true;
glBindFramebufferFn = &glBindFramebuffer;

1
graphics/opengl/opengl_ext.cpp
View file

@ -63,6 +63,7 @@ namespace graphics
g_isSeparateBlendFuncSupported = HasExtension("GL_EXT_blend_func_separate");
glBlendFuncSeparateFn = &glBlendFuncSeparateEXT;
glFlushFn = &glFlush;
glActiveTextureFn = &glActiveTexture;
glGetAttribLocationFn = &glGetAttribLocation;

4
graphics/opengl/texture.hpp
View file

@ -59,7 +59,7 @@ namespace graphics
/// resource update made in one thread to the another thread is
/// to call the glFlush in thread, which modifies resource and then rebind
/// resource in another threads that is using this resource, if any.
OGLCHECK(glFlush());
OGLCHECK(glFlushFn());
}
@ -238,7 +238,7 @@ namespace graphics
/// resource update made in one thread to the another thread is
/// to call the glFlush in thread, which modifies resource and then rebind
/// resource in another threads that is using this resource, if any.
OGLCHECK(glFlush());
OGLCHECK(glFlushFn());
}
template <typename Traits>