targets, radeong: Add Galahad.

Currently unconditional and causes segfaults.
This commit is contained in:
Corbin Simpson
2010-06-22 22:09:52 -07:00
parent 2560978588
commit 40faedfe7b
5 changed files with 8 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = identity
LIBNAME = galahad
C_SOURCES = \
glhd_objects.c \

View File

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

View File

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

View File

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

View File

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