glhd: Re-integrate with the debug system

This commit is contained in:
Jakob Bornecrantz 2010-06-28 21:50:51 +02:00
parent 2932dd6374
commit d12c4c5a62
2 changed files with 13 additions and 1 deletions

View File

@ -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;
}

View File

@ -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;