summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2010-06-23 11:06:42 -0700
committerCorbin Simpson <MostAwesomeDude@gmail.com>2010-06-23 11:06:42 -0700
commit95263058349060fcba9f59a866eb30b4656c33a5 (patch)
treefa573b5d178548107882c81dfb852d6b070dc418 /src
parent64682da8ab7aff7b4ce651db99a32ed1fd8b178c (diff)
glhd: Use an environment variable (GALAHAD) to enable. Off by default.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/galahad/glhd_drm.c3
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_drm.c3
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 78e290c9a8..d62f6f4f7b 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 590b1d047b..a9ae09cb60 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));
}