glhd: Re-integrate with the debug system

diff --git a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
index 1bc329c9f0caaf3ea40ffc1d0e230619d41d27ab..0433da6141d3c757aac8fd89062e876f46c0b118 100644 (file)
--- a/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_debug_helper.h
@@ -18,6 +18,10 @@
 #include "rbug/rbug_public.h"
 #endif
 
+#ifdef GALLIUM_GALAHAD
+#include "galahad/glhd_public.h"
+#endif
+
 static INLINE struct pipe_screen *
 debug_screen_wrap(struct pipe_screen *screen)
 {
@@ -30,6 +34,10 @@ debug_screen_wrap(struct pipe_screen *screen)
    screen = trace_screen_create(screen);
 #endif
 
+#if defined(GALLIUM_GALAHAD)
+   screen = galahad_screen_create(screen);
+#endif
+
    return screen;
 }
 

diff --git a/src/gallium/drivers/galahad/glhd_screen.c b/src/gallium/drivers/galahad/glhd_screen.c
index bcc37cb633a7afbdb842afd8a7e5fdcb33f572b9..4117485702efdcfe9462eecd734e9494810b8e02 100644 (file)
--- a/src/gallium/drivers/galahad/glhd_screen.c
+++ b/src/gallium/drivers/galahad/glhd_screen.c
@@ -36,6 +36,7 @@
 #include "glhd_context.h"
 #include "glhd_objects.h"
 
+DEBUG_GET_ONCE_BOOL_OPTION(galahad, "GALLIUM_GALAHAD", FALSE)
 
 static void
 galahad_screen_destroy(struct pipe_screen *_screen)
@@ -298,9 +299,12 @@ galahad_screen_create(struct pipe_screen *screen)
 {
    struct galahad_screen *glhd_screen;
 
+   if (!debug_get_option_galahad())
+      return screen;
+
    glhd_screen = CALLOC_STRUCT(galahad_screen);
    if (!glhd_screen) {
-      return NULL;
+      return screen;
    }
 
    glhd_screen->base.winsys = NULL;