[Bf-blender-cvs] [23d7ae1] blender2.8: OpenGL: backtrace on errors (--debug-gpu)
Mike Erwin
noreply at git.blender.org
Mon Aug 15 10:01:30 CEST 2016
Commit: 23d7ae184397dc6fa94af3a8d93ffc9d0d4b0393
Author: Mike Erwin
Date: Mon Aug 15 04:00:59 2016 -0400
Branches: blender2.8
https://developer.blender.org/rB23d7ae184397dc6fa94af3a8d93ffc9d0d4b0393
OpenGL: backtrace on errors (--debug-gpu)
Backtrace so we can pinpoint where the GL error came from. Then fflush
on severe errors in case it's severe enough to crash Blender.
===================================================================
M source/blender/gpu/intern/gpu_debug.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c
index 555af8b..21458a2 100644
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -207,13 +207,21 @@ static void APIENTRY gpu_debug_proc(
GLenum severity, GLsizei UNUSED(length),
const GLchar *message, const GLvoid *UNUSED(userParm))
{
+ bool backtrace = false;
+
switch (severity) {
case GL_DEBUG_SEVERITY_HIGH:
+ backtrace = true;
+ /* fall through */
case GL_DEBUG_SEVERITY_MEDIUM:
case GL_DEBUG_SEVERITY_LOW:
case GL_DEBUG_SEVERITY_NOTIFICATION: /* KHR has this, ARB does not */
fprintf(stderr, "GL %s %s: %s\n", source_name(source), message_type_name(type), message);
- fflush(stderr);
+ }
+
+ if (backtrace) {
+ BLI_system_backtrace(stderr);
+ fflush(stderr);
}
}
@@ -224,12 +232,20 @@ static void APIENTRY gpu_debug_proc_amd(
GLenum severity, GLsizei UNUSED(length),
const GLchar *message, GLvoid *UNUSED(userParm))
{
+ bool backtrace = false;
+
switch (severity) {
case GL_DEBUG_SEVERITY_HIGH:
+ backtrace = true;
+ /* fall through */
case GL_DEBUG_SEVERITY_MEDIUM:
case GL_DEBUG_SEVERITY_LOW:
fprintf(stderr, "GL %s: %s\n", category_name_amd(category), message);
- fflush(stderr);
+ }
+
+ if (backtrace) {
+ BLI_system_backtrace(stderr);
+ fflush(stderr);
}
}
#endif
More information about the Bf-blender-cvs
mailing list