Mesa (master): targets, radeong: Add Galahad.

[Corbin Simpson]

Module: Mesa
Branch: master
Commit: 40faedfe7b4c17bc62da4c5f661fac3cc292082d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=40faedfe7b4c17bc62da4c5f661fac3cc292082d

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Tue Jun 22 22:09:52 2010 -0700

targets, radeong: Add Galahad.

Currently unconditional and causes segfaults.

---

 src/gallium/drivers/galahad/Makefile       |    2 +-
 src/gallium/targets/dri-radeong/Makefile   |    1 +
 src/gallium/targets/egl-radeon/Makefile    |    1 +
 src/gallium/targets/xorg-radeon/Makefile   |    3 ++-
 src/gallium/winsys/radeon/drm/radeon_drm.c |    4 +++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/galahad/Makefile b/src/gallium/drivers/galahad/Makefile
index d5df84b..67d0874 100644
--- a/src/gallium/drivers/galahad/Makefile
+++ b/src/gallium/drivers/galahad/Makefile
@@ -1,7 +1,7 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-LIBNAME = identity
+LIBNAME = galahad
 
 C_SOURCES = \
 	glhd_objects.c \
diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-radeong/Makefile
index 8ef24c0..8ba1972 100644
--- a/src/gallium/targets/dri-radeong/Makefile
+++ b/src/gallium/targets/dri-radeong/Makefile
@@ -7,6 +7,7 @@ PIPE_DRIVERS = \
 	$(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
 	$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+	$(TOP)/src/gallium/drivers/galahad/libgalahad.a \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/rbug/librbug.a \
 	$(TOP)/src/gallium/drivers/r300/libr300.a
diff --git a/src/gallium/targets/egl-radeon/Makefile b/src/gallium/targets/egl-radeon/Makefile
index 8fcca26..64c20af 100644
--- a/src/gallium/targets/egl-radeon/Makefile
+++ b/src/gallium/targets/egl-radeon/Makefile
@@ -7,6 +7,7 @@ EGL_DRIVER_LIBS = -ldrm_radeon
 
 EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
+	$(TOP)/src/gallium/drivers/galahad/libgalahad.a \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/rbug/librbug.a \
 	$(TOP)/src/gallium/drivers/r300/libr300.a
diff --git a/src/gallium/targets/xorg-radeon/Makefile b/src/gallium/targets/xorg-radeon/Makefile
index a4951c4..6cbc61e 100644
--- a/src/gallium/targets/xorg-radeon/Makefile
+++ b/src/gallium/targets/xorg-radeon/Makefile
@@ -13,10 +13,11 @@ DRIVER_LINKS = \
         $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
         $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
         $(TOP)/src/gallium/drivers/r300/libr300.a \
+		$(TOP)/src/gallium/drivers/galahad/libgalahad.a \
         $(TOP)/src/gallium/drivers/trace/libtrace.a \
         $(TOP)/src/gallium/drivers/rbug/librbug.a \
         $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
         $(GALLIUM_AUXILIARIES) \
-	$(shell pkg-config --libs libdrm libdrm_intel)
+	$(shell pkg-config --libs libdrm libdrm_radeon)
 
 include ../Makefile.xorg
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm.c b/src/gallium/winsys/radeon/drm/radeon_drm.c
index 59f1b10..a9ae09c 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm.c
@@ -34,6 +34,8 @@
 #include "radeon_buffer.h"
 
 #include "r300_winsys.h"
+
+#include "galahad/glhd_drm.h"
 #include "trace/tr_drm.h"
 
 #include "util/u_memory.h"
@@ -188,5 +190,5 @@ static struct drm_api radeon_drm_api_hooks = {
 
 struct drm_api* drm_api_create()
 {
-    return trace_drm_create(&radeon_drm_api_hooks);
+    return galahad_drm_create(trace_drm_create(&radeon_drm_api_hooks));
 }