Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	.gitignore
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	include/mbgl/map/map.hpp
	src/mbgl/map/map.cpp
	src/mbgl/storage/caching_http_file_source.cpp

2 files changed, 108 insertions, 0 deletions

diff --git a/src/mbgl/platform/gl.cpp b/src/mbgl/platform/gl.cpp
new file mode 100644
index 0000000000..155fd70d95
--- /dev/null
+++ b/src/mbgl/platform/gl.cpp
@@ -0,0 +1,101 @@
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/platform/log.hpp>
+
+#include <iostream>
+
+
+namespace mbgl {
+namespace gl {
+
+PFNGLDEBUGMESSAGECONTROLPROC DebugMessageControl = nullptr;
+PFNGLDEBUGMESSAGEINSERTPROC DebugMessageInsert = nullptr;
+PFNGLDEBUGMESSAGECALLBACKPROC DebugMessageCallback = nullptr;
+PFNGLGETDEBUGMESSAGELOGPROC GetDebugMessageLog = nullptr;
+PFNGLGETPOINTERVPROC GetPointerv = nullptr;
+PFNGLPUSHDEBUGGROUPPROC PushDebugGroup = nullptr;
+PFNGLPOPDEBUGGROUPPROC PopDebugGroup = nullptr;
+PFNGLOBJECTLABELPROC ObjectLabel = nullptr;
+PFNGLGETOBJECTLABELPROC GetObjectLabel = nullptr;
+PFNGLOBJECTPTRLABELPROC ObjectPtrLabel = nullptr;
+PFNGLGETOBJECTPTRLABELPROC GetObjectPtrLabel = nullptr;
+
+void debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei, const GLchar *message, const void *) {
+    std::string strSource;
+    switch (source) {
+        case GL_DEBUG_SOURCE_API: strSource = "DEBUG_SOURCE_API"; break;
+        case GL_DEBUG_SOURCE_WINDOW_SYSTEM: strSource = "DEBUG_SOURCE_WINDOW_SYSTEM"; break;
+        case GL_DEBUG_SOURCE_SHADER_COMPILER: strSource = "DEBUG_SOURCE_SHADER_COMPILER"; break;
+        case GL_DEBUG_SOURCE_THIRD_PARTY: strSource = "DEBUG_SOURCE_THIRD_PARTY"; break;
+        case GL_DEBUG_SOURCE_APPLICATION: strSource = "DEBUG_SOURCE_APPLICATION"; break;
+        case GL_DEBUG_SOURCE_OTHER: strSource = "DEBUG_SOURCE_OTHER"; break;
+        default: strSource = "(unknown)"; break;
+    }
+
+    std::string strType;
+    switch (type) {
+        case GL_DEBUG_TYPE_ERROR: strType = "DEBUG_TYPE_ERROR"; break;
+        case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR: strType = "DEBUG_TYPE_DEPRECATED_BEHAVIOR"; break;
+        case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR: strType = "DEBUG_TYPE_UNDEFINED_BEHAVIOR"; break;
+        case GL_DEBUG_TYPE_PERFORMANCE: strType = "DEBUG_TYPE_PERFORMANCE"; break;
+        case GL_DEBUG_TYPE_PORTABILITY: strType = "DEBUG_TYPE_PORTABILITY"; break;
+        case GL_DEBUG_TYPE_OTHER: strType = "DEBUG_TYPE_OTHER"; break;
+        case GL_DEBUG_TYPE_MARKER: strType = "DEBUG_TYPE_MARKER"; break;
+        case GL_DEBUG_TYPE_PUSH_GROUP: strType = "DEBUG_TYPE_OTHER"; break;
+        case GL_DEBUG_TYPE_POP_GROUP: strType = "DEBUG_TYPE_POP_GROUP"; break;
+        default: strSource = "(unknown)"; break;
+    }
+
+    std::string strSeverity;
+    mbgl::EventSeverity evtSeverity;
+    switch (severity) {
+        case GL_DEBUG_SEVERITY_HIGH: strSeverity = "DEBUG_SEVERITY_HIGH"; evtSeverity = mbgl::EventSeverity::Error; break;
+        case GL_DEBUG_SEVERITY_MEDIUM: strSeverity = "DEBUG_SEVERITY_MEDIUM"; evtSeverity = mbgl::EventSeverity::Warning; break;
+        case GL_DEBUG_SEVERITY_LOW: strSeverity = "DEBUG_SEVERITY_LOW"; evtSeverity = mbgl::EventSeverity::Info; break;
+        case GL_DEBUG_SEVERITY_NOTIFICATION: strSeverity = "DEBUG_SEVERITY_NOTIFICATION"; evtSeverity = mbgl::EventSeverity::Debug; break;
+        default: strSource = "(unknown)"; evtSeverity = mbgl::EventSeverity::Debug; break;
+    }
+
+    mbgl::Log::Record(evtSeverity, mbgl::Event::OpenGL, "GL_%s GL_%s %u GL_%s - %s", strSource.c_str(), strType.c_str(), id, strSeverity.c_str(), message);
+}
+
+PFNGLINSERTEVENTMARKEREXTPROC InsertEventMarkerEXT = nullptr;
+PFNGLPUSHGROUPMARKEREXTPROC PushGroupMarkerEXT = nullptr;
+PFNGLPOPGROUPMARKEREXTPROC PopGroupMarkerEXT = nullptr;
+
+PFNGLLABELOBJECTEXTPROC LabelObjectEXT = nullptr;
+PFNGLGETOBJECTLABELEXTPROC GetObjectLabelEXT = nullptr;
+
+PFNGLBINDVERTEXARRAYPROC BindVertexArray = nullptr;
+PFNGLDELETEVERTEXARRAYSPROC DeleteVertexArrays = nullptr;
+PFNGLGENVERTEXARRAYSPROC GenVertexArrays = nullptr;
+PFNGLISVERTEXARRAYPROC IsVertexArray = nullptr;
+
+// GL_OES_packed_depth_stencil
+bool isPackedDepthStencilSupported = false;
+
+// GL_OES_depth24
+bool isDepth24Supported = false;
+
+}
+}
+
+void _CHECK_GL_ERROR(const char *cmd, const char *file, int line) {
+    std::cout <<  cmd << ";" << std::endl;
+
+    GLenum err;
+
+    while ((err = glGetError()) != GL_NO_ERROR) {
+        std::string error;
+        switch (err) {
+            case GL_INVALID_OPERATION: error = "INVALID_OPERATION"; break;
+            case GL_INVALID_ENUM: error = "INVALID_ENUM"; break;
+            case GL_INVALID_VALUE: error = "INVALID_VALUE"; break;
+            case GL_OUT_OF_MEMORY: error = "OUT_OF_MEMORY"; break;
+            case GL_INVALID_FRAMEBUFFER_OPERATION:  error = "INVALID_FRAMEBUFFER_OPERATION";  break;
+            default: error = "(unknown)"; break;
+        }
+
+        mbgl::Log::Error(mbgl::Event::OpenGL, "GL_%s (0x%04X) - %s:%i", error.c_str(), file, line, err);
+        exit(1);
+    }
+}
diff --git a/src/mbgl/platform/log.cpp b/src/mbgl/platform/log.cpp
new file mode 100644
index 0000000000..b83c7a9322
--- /dev/null
+++ b/src/mbgl/platform/log.cpp
@@ -0,0 +1,7 @@
+#include <mbgl/platform/log.hpp>
+
+namespace mbgl {
+
+std::unique_ptr<LogBackend> Log::Backend;
+
+}