diff options
author | Leith Bade <leith@mapbox.com> | 2014-12-02 03:24:42 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-12-02 03:24:42 +1100 |
commit | 2800f361424ee84af283fbe7bb73b5afbe264c6e (patch) | |
tree | 8abfde9c08cdf7ed959378101b76c7ae3ec3b1e7 /src | |
parent | 66349e33ab3bde1a7fe901e84c70c04884476f78 (diff) | |
download | qtlocation-mapboxgl-2800f361424ee84af283fbe7bb73b5afbe264c6e.tar.gz |
Add debug markers and labels
Diffstat (limited to 'src')
-rw-r--r-- | src/platform/gl.cpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/platform/gl.cpp b/src/platform/gl.cpp index 7fb4debd7a..c0c3bb1c74 100644 --- a/src/platform/gl.cpp +++ b/src/platform/gl.cpp @@ -7,17 +7,17 @@ namespace mbgl { namespace gl { -PFNGLDEBUGMESSAGECONTROLPROC DebugMessageControl; -PFNGLDEBUGMESSAGEINSERTPROC DebugMessageInsert; -PFNGLDEBUGMESSAGECALLBACKPROC DebugMessageCallback; -PFNGLGETDEBUGMESSAGELOGPROC GetDebugMessageLog; -PFNGLGETPOINTERVPROC GetPointerv; -PFNGLPUSHDEBUGGROUPPROC PushDebugGroup; -PFNGLPOPDEBUGGROUPPROC PopDebugGroup; -PFNGLOBJECTLABELPROC ObjectLabel; -PFNGLGETOBJECTLABELPROC GetObjectLabel; -PFNGLOBJECTPTRLABELPROC ObjectPtrLabel; -PFNGLGETOBJECTPTRLABELPROC GetObjectPtrLabel; +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; @@ -58,6 +58,13 @@ void debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsi 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; |