From 95263058349060fcba9f59a866eb30b4656c33a5 Mon Sep 17 00:00:00 2001 From: Corbin Simpson Date: Wed, 23 Jun 2010 11:06:42 -0700 Subject: [PATCH] glhd: Use an environment variable (GALAHAD) to enable. Off by default. --- src/gallium/drivers/galahad/glhd_drm.c | 3 +++ src/gallium/winsys/radeon/drm/radeon_drm.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/galahad/glhd_drm.c b/src/gallium/drivers/galahad/glhd_drm.c index 78e290c..d62f6f4 100644 --- a/src/gallium/drivers/galahad/glhd_drm.c +++ b/src/gallium/drivers/galahad/glhd_drm.c @@ -75,6 +75,9 @@ galahad_drm_create(struct drm_api *api) if (!api) goto error; + if (!debug_get_option("GALAHAD", FALSE)) + goto error; + glhd_api = CALLOC_STRUCT(galahad_drm_api); if (!glhd_api) diff --git a/src/gallium/winsys/radeon/drm/radeon_drm.c b/src/gallium/winsys/radeon/drm/radeon_drm.c index 590b1d0..a9ae09c 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm.c @@ -190,6 +190,5 @@ static struct drm_api radeon_drm_api_hooks = { struct drm_api* drm_api_create() { - //return galahad_drm_create(trace_drm_create(&radeon_drm_api_hooks)); - return trace_drm_create(&radeon_drm_api_hooks); + return galahad_drm_create(trace_drm_create(&radeon_drm_api_hooks)); } -- 2.7.4