lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow specifying source/id/severity when adding GL markers

Browse Source
This commit is contained in:
baldurk
2017-10-27 17:12:29 +01:00
parent 8346c630cb
commit fa071a6ca5
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.cpp
+6 -7
View File
@@ -737,9 +737,9 @@ void DoVendorChecks(const GLHookSet &gl, GLPlatform &platform, GLWindowingData c
const GLHookSet *GLMarkerRegion::gl;
GLMarkerRegion::GLMarkerRegion(const std::string &marker)
GLMarkerRegion::GLMarkerRegion(const std::string &marker, GLenum source, GLuint id)
{
Begin(marker);
Begin(marker, source, id);
}
GLMarkerRegion::~GLMarkerRegion()
@@ -747,21 +747,20 @@ GLMarkerRegion::~GLMarkerRegion()
End();
}
void GLMarkerRegion::Begin(const std::string &marker)
void GLMarkerRegion::Begin(const std::string &marker, GLenum source, GLuint id)
{
if(gl == NULL || !HasExt[KHR_debug] || !gl->glPushDebugGroup)
return;
gl->glPushDebugGroup(eGL_DEBUG_SOURCE_APPLICATION, 0, -1, marker.c_str());
gl->glPushDebugGroup(source, id, -1, marker.c_str());
}
void GLMarkerRegion::Set(const std::string &marker)
void GLMarkerRegion::Set(const std::string &marker, GLenum source, GLuint id, GLenum severity)
{
if(gl == NULL || !HasExt[KHR_debug] || !gl->glDebugMessageInsert)
return;
gl->glDebugMessageInsert(eGL_DEBUG_SOURCE_APPLICATION, eGL_DEBUG_TYPE_MARKER, 0,
eGL_DEBUG_SEVERITY_NOTIFICATION, -1, marker.c_str());
gl->glDebugMessageInsert(source, eGL_DEBUG_TYPE_MARKER, id, severity, -1, marker.c_str());
}
void GLMarkerRegion::End()
renderdoc/driver/gl/gl_common.h
+6 -3
View File
@@ -248,11 +248,14 @@ struct GLHookSet;
// replay only class for handling marker regions
struct GLMarkerRegion
{
GLMarkerRegion(const std::string &marker);
GLMarkerRegion(const std::string &marker, GLenum source = eGL_DEBUG_SOURCE_APPLICATION,
GLuint id = 0);
~GLMarkerRegion();
static void Begin(const std::string &marker);
static void Set(const std::string &marker);
static void Begin(const std::string &marker, GLenum source = eGL_DEBUG_SOURCE_APPLICATION,
GLuint id = 0);
static void Set(const std::string &marker, GLenum source = eGL_DEBUG_SOURCE_APPLICATION,
GLuint id = 0, GLenum severity = eGL_DEBUG_SEVERITY_NOTIFICATION);
static void End();
static const GLHookSet *gl;