zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve debug level filtering

This commit is contained in:
Magnus Norddahl 2016-08-18 02:10:54 +02:00
parent b21b65eb43
commit f75b6d8c5d
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gl/system/gl_debug.cpp
View File

@ -156,6 +156,26 @@ void FGLDebug::UpdateLoggingLevel()
} }
} }
//-----------------------------------------------------------------------------
//
// The log may already contain entries for a debug level we are no longer
// interested in..
//
//-----------------------------------------------------------------------------
bool FGLDebug::IsFilteredByDebugLevel(GLenum severity)
{
int severityLevel = 0;
switch (severity)
{
case GL_DEBUG_SEVERITY_LOW: severityLevel = 1; break;
case GL_DEBUG_SEVERITY_MEDIUM: severityLevel = 2; break;
case GL_DEBUG_SEVERITY_HIGH: severityLevel = 3; break;
case GL_DEBUG_SEVERITY_NOTIFICATION: severityLevel = 4; break;
}
return severityLevel >= (int)gl_debug_level;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// Prints all logged messages to the console // Prints all logged messages to the console
@ -193,6 +213,7 @@ void FGLDebug::OutputMessageLog()
GLsizei offset = 0; GLsizei offset = 0;
for (GLuint i = 0; i < numMessages; i++) for (GLuint i = 0; i < numMessages; i++)
{ {
if (!IsFilteredByDebugLevel(severities[i]))
PrintMessage(sources[i], types[i], ids[i], severities[i], lengths[i], &messageLog[offset]); PrintMessage(sources[i], types[i], ids[i], severities[i], lengths[i], &messageLog[offset]);
offset += lengths[i]; offset += lengths[i];
} }
@ -248,6 +269,9 @@ void FGLDebug::PrintMessage(GLenum source, GLenum type, GLuint id, GLenum severi
void FGLDebug::DebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam) void FGLDebug::DebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
{ {
if (IsFilteredByDebugLevel(severity))
return;
PrintMessage(source, type, id, severity, length, message); PrintMessage(source, type, id, severity, length, message);
if (severity != GL_DEBUG_SEVERITY_NOTIFICATION) if (severity != GL_DEBUG_SEVERITY_NOTIFICATION)

1
src/gl/system/gl_debug.h
View File

@ -22,6 +22,7 @@ private:
void UpdateLoggingLevel(); void UpdateLoggingLevel();
void OutputMessageLog(); void OutputMessageLog();
static bool IsFilteredByDebugLevel(GLenum severity);
static void PrintMessage(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message); static void PrintMessage(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message);
static void APIENTRY DebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam); static void APIENTRY DebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);