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

Codereview feat VNG.

Browse source
This commit is contained in:
Dmitry Kunin 2013-12-26 17:34:16 +03:00 • committed by Alex Zolotarev
parent b34a3e038b
commit 7a7303a1a4
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/jni/opengl/android_gl_utils.h
View file

@ -10,25 +10,26 @@ public:
: m_display(display)
{}
int operator()(EGLConfig const & l, EGLConfig const & r)
int operator()(EGLConfig const & l, EGLConfig const & r) const
{
return configWeight(l) - configWeight(r);
}
int configWeight(EGLConfig const & config)
int configWeight(EGLConfig const & config) const
{
int val = -1;
eglGetConfigAttrib(m_display, config, EGL_CONFIG_CAVEAT, &val);
switch (val) {
case EGL_NONE:
return 0;
case EGL_SLOW_CONFIG:
return 1;
case EGL_NON_CONFORMANT_CONFIG:
return 2;
default:
return 0;
switch (val)
{
case EGL_NONE:
return 0;
case EGL_SLOW_CONFIG:
return 1;
case EGL_NON_CONFORMANT_CONFIG:
return 2;
default:
return 0;
}
}

22
android/jni/opengl/androidoglcontextfactory.cpp
View file

@ -3,7 +3,7 @@
#include "../../../base/assert.hpp"
#include <algorithm>
#include "../../../std/algorithm.hpp"
static EGLint * getConfigAttributesList()
{
@ -58,7 +58,7 @@ AndroidOGLContextFactory::~AndroidOGLContextFactory()
OGLContext * AndroidOGLContextFactory::getDrawContext()
{
CHECK(m_windowSurface != EGL_NO_SURFACE, ());
ASSERT(m_windowSurface != EGL_NO_SURFACE, ());
if (m_drawContext == NULL)
m_drawContext = new AndroidOGLContext(m_display, m_windowSurface, m_config, m_uploadContext);
return m_drawContext;
@ -66,7 +66,7 @@ OGLContext * AndroidOGLContextFactory::getDrawContext()
OGLContext * AndroidOGLContextFactory::getResourcesUploadContext()
{
CHECK(m_pixelbufferSurface != EGL_NO_SURFACE, ());
ASSERT(m_pixelbufferSurface != EGL_NO_SURFACE, ());
if (m_uploadContext == NULL)
m_uploadContext = new AndroidOGLContext(m_display, m_pixelbufferSurface, m_config, m_drawContext);
return m_uploadContext;
@ -75,12 +75,12 @@ OGLContext * AndroidOGLContextFactory::getResourcesUploadContext()
void AndroidOGLContextFactory::createWindowSurface()
{
EGLConfig configs[40];
int num_configs = 0;
VERIFY(eglChooseConfig(m_display, getConfigAttributesList(), configs, 40, &num_configs) == EGL_TRUE, ());
ASSERT(num_configs > 0, ("Didn't find any configs."));
int count = 0;
VERIFY(eglChooseConfig(m_display, getConfigAttributesList(), configs, 40, &count) == EGL_TRUE, ());
ASSERT(count > 0, ("Didn't find any configs."));
std::sort(&configs[0], &configs[num_configs], ConfigComparator(m_display));
for (int i = 0; i < num_configs; ++i)
sort(&configs[0], &configs[count], ConfigComparator(m_display));
for (int i = 0; i < count; ++i)
{
EGLConfig currentConfig = configs[i];
@ -97,19 +97,21 @@ void AndroidOGLContextFactory::createWindowSurface()
break;
}
CHECK(m_config != NULL, ());
CHECK(m_windowSurface != EGL_NO_SURFACE, ());
}
void AndroidOGLContextFactory::createPixelbufferSurface()
{
CHECK(m_config != NULL, ());
ASSERT(m_config != NULL, ());
const GLuint size = 1; // yes, 1 is the correct size, we dont really draw on it
static EGLint surfaceConfig[] = {
EGL_WIDTH, size, EGL_HEIGHT, size, EGL_NONE
};
m_pixelbufferSurface = eglCreatePbufferSurface(m_display, m_config, surfaceConfig);
ASSERT(m_pixelbufferSurface != EGL_NO_SURFACE, ());
CHECK(m_pixelbufferSurface != EGL_NO_SURFACE, ());
}