gallium/ddebug: new pipe for hang detection and driver state dumping (v2)

[mesa.git] / src / gallium / auxiliary / target-helpers / inline_debug_helper.h

diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index 43a724979b034e65114e7b762aff06fd5cbbf8e0..2443bf214682893711ce0808f7134b33eabf4833 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -4,13 +4,16 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
+#include "util/u_tests.h"
 
 
 /* Helper function to wrap a screen with
  * one or more debug driver: rbug, trace.
  */
 
-#ifdef DEBUG
+#ifdef GALLIUM_DDEBUG
+#include "ddebug/dd_public.h"
+#endif
 
 #ifdef GALLIUM_TRACE
 #include "trace/tr_public.h"
@@ -20,20 +23,20 @@
 #include "rbug/rbug_public.h"
 #endif
 
-#ifdef GALLIUM_GALAHAD
-#include "galahad/glhd_public.h"
-#endif
-
 #ifdef GALLIUM_NOOP
 #include "noop/noop_public.h"
 #endif
 
-#endif /* DEBUG */
-
-static INLINE struct pipe_screen *
+/*
+ * TODO: Audit the following *screen_create() - all of
+ * them should return the original screen on failuire.
+ */
+static inline struct pipe_screen *
 debug_screen_wrap(struct pipe_screen *screen)
 {
-#ifdef DEBUG
+#if defined(GALLIUM_DDEBUG)
+   screen = ddebug_screen_create(screen);
+#endif
 
 #if defined(GALLIUM_RBUG)
    screen = rbug_screen_create(screen);
@@ -43,15 +46,12 @@ debug_screen_wrap(struct pipe_screen *screen)
    screen = trace_screen_create(screen);
 #endif
 
-#if defined(GALLIUM_GALAHAD)
-   screen = galahad_screen_create(screen);
-#endif
-
 #if defined(GALLIUM_NOOP)
    screen = noop_screen_create(screen);
 #endif
 
-#endif /* DEBUG */
+   if (debug_get_bool_option("GALLIUM_TESTS", FALSE))
+      util_run_tests(screen);
 
    return screen;
 }