targets, radeong: Add Galahad.

Currently unconditional and causes segfaults.

diff --git a/src/gallium/drivers/galahad/Makefile b/src/gallium/drivers/galahad/Makefile
index d5df84b71b82e22ed5d41b2a47598928e85ad083..67d087456626256e8f9af911225e02ecf9c23173 100644 (file)
--- 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 8ef24c08215ff85af6e391f6dec9f743c6ebe201..8ba1972ffa44daf695860b96aaa8848680565eb0 100644 (file)
--- 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 8fcca2682655c6ca910114280ff08f41743c571f..64c20afc2beaa8d7a9c52b84c47ac1ae3d3cc3a7 100644 (file)
--- 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 a4951c4bba0cc0d646e2078868901ef1c1ac9c15..6cbc61e7aecf47aa505e88cd1d87cc15c533792f 100644 (file)
--- 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 59f1b10230e3af915c7f296143832e350001e724..a9ae09cb60eec9f38539c1fda3467fcf2adef501 100644 (file)
--- 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));
 }