Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

naming refactor

Browse source
This commit is contained in:
Denis 2014-10-02 12:05:16 +03:00
parent 52a45474b7
commit f78bb5ee96
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
OsmAnd/src/net/osmand/plus/views/controllers/NativeViewController.java
View file

@ -67,7 +67,7 @@ public class NativeViewController extends MapViewBaseController {
private QIODeviceLogSink fileLogSink; private QIODeviceLogSink fileLogSink;
private RotatedTileBox currentViewport = null; private RotatedTileBox currentViewport = null;
private boolean offlineMap = true; private boolean offlineMap = false;
private GestureDetector gestureDetector; private GestureDetector gestureDetector;
@ -252,8 +252,8 @@ public class NativeViewController extends MapViewBaseController {
} }
private class EGLContextFactory implements GLSurfaceView.EGLContextFactory { private class EGLContextFactory implements GLSurfaceView.EGLContextFactory {
private EGLContext _gpuWorkerContext; private EGLContext gpuWorkerContext;
private EGLSurface _gpuWorkerFakeSurface; private EGLSurface gpuWorkerFakeSurface;
public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) { public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
final String eglExtensions = egl.eglQueryString(display, EGL10.EGL_EXTENSIONS); final String eglExtensions = egl.eglQueryString(display, EGL10.EGL_EXTENSIONS);
@ -280,7 +280,7 @@ public class NativeViewController extends MapViewBaseController {
Log.i(NATIVE_TAG, "Creating GPU worker context..."); Log.i(NATIVE_TAG, "Creating GPU worker context...");
try { try {
_gpuWorkerContext = egl.eglCreateContext( gpuWorkerContext = egl.eglCreateContext(
display, display,
eglConfig, eglConfig,
mainContext, mainContext,
@ -288,13 +288,13 @@ public class NativeViewController extends MapViewBaseController {
} catch (Exception e) { } catch (Exception e) {
Log.e(NATIVE_TAG, "Failed to create GPU worker context", e); Log.e(NATIVE_TAG, "Failed to create GPU worker context", e);
} }
if (_gpuWorkerContext == null || _gpuWorkerContext == EGL10.EGL_NO_CONTEXT) if (gpuWorkerContext == null || gpuWorkerContext == EGL10.EGL_NO_CONTEXT)
{ {
Log.e(NATIVE_TAG, "Failed to create GPU worker context: " + egl.eglGetError()); Log.e(NATIVE_TAG, "Failed to create GPU worker context: " + egl.eglGetError());
_gpuWorkerContext = null; gpuWorkerContext = null;
} }
if (_gpuWorkerContext != null) if (gpuWorkerContext != null)
{ {
Log.i(NATIVE_TAG, "Creating GPU worker fake surface..."); Log.i(NATIVE_TAG, "Creating GPU worker fake surface...");
try { try {
@ -302,21 +302,21 @@ public class NativeViewController extends MapViewBaseController {
EGL10.EGL_WIDTH, 1, EGL10.EGL_WIDTH, 1,
EGL10.EGL_HEIGHT, 1, EGL10.EGL_HEIGHT, 1,
EGL10.EGL_NONE }; EGL10.EGL_NONE };
_gpuWorkerFakeSurface = egl.eglCreatePbufferSurface(display, eglConfig, surfaceAttribList); gpuWorkerFakeSurface = egl.eglCreatePbufferSurface(display, eglConfig, surfaceAttribList);
} catch (Exception e) { } catch (Exception e) {
Log.e(NATIVE_TAG, "Failed to create GPU worker fake surface", e); Log.e(NATIVE_TAG, "Failed to create GPU worker fake surface", e);
} }
if (_gpuWorkerFakeSurface == null || _gpuWorkerFakeSurface == EGL10.EGL_NO_SURFACE) if (gpuWorkerFakeSurface == null || gpuWorkerFakeSurface == EGL10.EGL_NO_SURFACE)
{ {
Log.e(NATIVE_TAG, "Failed to create GPU worker fake surface: " + egl.eglGetError()); Log.e(NATIVE_TAG, "Failed to create GPU worker fake surface: " + egl.eglGetError());
_gpuWorkerFakeSurface = null; gpuWorkerFakeSurface = null;
} }
} }
MapRendererSetupOptions rendererSetupOptions = new MapRendererSetupOptions(); MapRendererSetupOptions rendererSetupOptions = new MapRendererSetupOptions();
if (_gpuWorkerContext != null && _gpuWorkerFakeSurface != null) { if (gpuWorkerContext != null && gpuWorkerFakeSurface != null) {
rendererSetupOptions.setGpuWorkerThreadEnabled(true); rendererSetupOptions.setGpuWorkerThreadEnabled(true);
gpuWorkerThreadPrologue = new GpuWorkerThreadPrologue(egl, display, _gpuWorkerContext, _gpuWorkerFakeSurface); gpuWorkerThreadPrologue = new GpuWorkerThreadPrologue(egl, display, gpuWorkerContext, gpuWorkerFakeSurface);
rendererSetupOptions.setGpuWorkerThreadPrologue(gpuWorkerThreadPrologue.getBinding()); rendererSetupOptions.setGpuWorkerThreadPrologue(gpuWorkerThreadPrologue.getBinding());
gpuWorkerThreadEpilogue = new GpuWorkerThreadEpilogue(egl); gpuWorkerThreadEpilogue = new GpuWorkerThreadEpilogue(egl);
rendererSetupOptions.setGpuWorkerThreadEpilogue(gpuWorkerThreadEpilogue.getBinding()); rendererSetupOptions.setGpuWorkerThreadEpilogue(gpuWorkerThreadEpilogue.getBinding());
@ -333,14 +333,14 @@ public class NativeViewController extends MapViewBaseController {
public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) { public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
egl.eglDestroyContext(display, context); egl.eglDestroyContext(display, context);
if (_gpuWorkerContext != null) { if (gpuWorkerContext != null) {
egl.eglDestroyContext(display, _gpuWorkerContext); egl.eglDestroyContext(display, gpuWorkerContext);
_gpuWorkerContext = null; gpuWorkerContext = null;
} }
if (_gpuWorkerFakeSurface != null) { if (gpuWorkerFakeSurface != null) {
egl.eglDestroySurface(display, _gpuWorkerFakeSurface); egl.eglDestroySurface(display, gpuWorkerFakeSurface);
_gpuWorkerFakeSurface = null; gpuWorkerFakeSurface = null;
} }
} }
} }