tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Disable debug groups in release builds

Browse Source
This commit is contained in:
John Firebaugh
2017-01-17 08:27:51 -08:00
parent ed80755084
commit b04e11b5ca
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/mbgl/gl/debugging.cpp
View File

@@ -80,34 +80,6 @@ static ExtensionFunction<
{"GL_ARB_debug_output", "glDebugMessageCallbackARB"}
});
static ExtensionFunction<
void (GLenum source,
GLuint id,
GLsizei length,
const GLchar *message)>
PushDebugGroup({
{"GL_KHR_debug", "glPushDebugGroup"}
});
static ExtensionFunction<
void ()>
PopDebugGroup({
{"GL_KHR_debug", "glPopDebugGroup"}
});
static ExtensionFunction<
void (GLsizei length,
const GLchar *marker)>
PushGroupMarkerEXT({
{"GL_EXT_debug_marker", "glPushGroupMarkerEXT"}
});
static ExtensionFunction<
void ()>
PopGroupMarkerEXT({
{"GL_EXT_debug_marker", "glPopGroupMarkerEXT"}
});
void debugCallback(GLenum source,
GLenum type,
GLuint id,
@@ -170,6 +142,35 @@ void enable() {
MBGL_CHECK_ERROR(DebugMessageCallback(debugCallback, nullptr));
}
#ifndef NDEBUG
static ExtensionFunction<
void (GLenum source,
GLuint id,
GLsizei length,
const GLchar *message)>
PushDebugGroup({
{"GL_KHR_debug", "glPushDebugGroup"}
});
static ExtensionFunction<
void ()>
PopDebugGroup({
{"GL_KHR_debug", "glPopDebugGroup"}
});
static ExtensionFunction<
void (GLsizei length,
const GLchar *marker)>
PushGroupMarkerEXT({
{"GL_EXT_debug_marker", "glPushGroupMarkerEXT"}
});
static ExtensionFunction<
void ()>
PopGroupMarkerEXT({
{"GL_EXT_debug_marker", "glPopGroupMarkerEXT"}
});
group::group(const std::string& str) {
if (PushDebugGroup) {
PushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(str.size()), str.c_str());
@@ -185,6 +186,7 @@ group::~group() {
PopGroupMarkerEXT();
}
}
#endif
} // namespace debugging
} // namespace gl

16
src/mbgl/gl/debugging.hpp
View File

@@ -2,25 +2,25 @@
#include <string>
#ifndef NDEBUG
#define __MBGL_DEBUG_GROUP_NAME2(counter) __MBGL_DEBUG_GROUP_##counter
#define __MBGL_DEBUG_GROUP_NAME(counter) __MBGL_DEBUG_GROUP_NAME2(counter)
#define MBGL_DEBUG_GROUP(string) ::mbgl::gl::debugging::group __MBGL_DEBUG_GROUP_NAME(__LINE__)(string);
#else
#define MBGL_DEBUG_GROUP(string)
#endif
namespace mbgl {
namespace gl {
namespace debugging {
void enable();
#ifndef NDEBUG
struct group {
group(const std::string&);
~group();
};
#define __MBGL_DEBUG_GROUP_NAME2(counter) __MBGL_DEBUG_GROUP_##counter
#define __MBGL_DEBUG_GROUP_NAME(counter) __MBGL_DEBUG_GROUP_NAME2(counter)
#define MBGL_DEBUG_GROUP(string) ::mbgl::gl::debugging::group __MBGL_DEBUG_GROUP_NAME(__LINE__)(string);
#else
#define MBGL_DEBUG_GROUP(string)
#endif
} // namespace debugging
} // namespace gl
} // namespace mbgl