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

[drape] call gl flush before move geometry to other thread. This need to uploaded geometry became available on other thread with other ogl context

Browse source
This commit is contained in:
ExMix 2014-01-10 12:53:02 +03:00 • committed by Alex Zolotarev
parent 357e37d33e
commit dd1d2ad6a9
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drape/drape_tests/glfunctions.cpp
View file

@ -7,6 +7,11 @@ using namespace emul;
#define MOCK_CALL(f) GLMockFunctions::Instance().f;
void GLFunctions::glFlush()
{
}
uint32_t GLFunctions::glGenVertexArray()
{
return MOCK_CALL(glGenVertexArray());

7
drape/glfunctions.cpp
View file

@ -15,6 +15,7 @@ namespace
void (*glClearColorFn)(GLfloat r, GLfloat g, GLfloat b, GLfloat a) = NULL;
void (*glClearFn)(GLbitfield mask) = NULL;
void (*glViewportFn)(GLint x, GLint y, GLsizei w, GLsizei h) = NULL;
void (*glFlushFn)() = NULL;
/// VAO
void (*glGenVertexArraysFn)(GLsizei n, GLuint * ids) = NULL;
@ -102,6 +103,7 @@ void GLFunctions::Init()
glClearColorFn = &::glClearColor;
glClearFn = &::glClear;
glViewportFn = &::glViewport;
glFlushFn = &::glFlush;
/// VBO
glGenBuffersFn = &::glGenBuffers;
@ -181,6 +183,11 @@ void GLFunctions::glViewport(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
GLCHECK(glViewportFn(x, y, w, h));
}
void GLFunctions::glFlush()
{
GLCHECK(glFlushFn());
}
uint32_t GLFunctions::glGenVertexArray()
{
ASSERT(glGenVertexArraysFn != NULL, ());

1
drape/glfunctions.hpp
View file

@ -12,6 +12,7 @@ public:
static void glClearColor(float r, float g, float b, float a);
static void glClear();
static void glViewport(uint32_t x, uint32_t y, uint32_t w, uint32_t h);
static void glFlush();
/// VAO support
static uint32_t glGenVertexArray();

1
drape_frontend/batchers_pool.cpp
View file

@ -18,6 +18,7 @@ namespace df
const GLState & state,
TransferPointer<VertexArrayBuffer> buffer)
{
GLFunctions::glFlush();
sendMessage(MovePointer<Message>(new FlushTileMessage(key, state, buffer)));
}
}