summaryrefslogtreecommitdiff
path: root/src/gallium/targets/dri-nouveau
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2010-06-24 01:53:05 +0200
committerJakob Bornecrantz <jakob@vmware.com>2010-06-24 02:19:43 +0200
commit57d14f2fbbfc50656be76fa0f77e1ed505180204 (patch)
treed927264c83d9a36aa3ccc2cd141108ac02152e62 /src/gallium/targets/dri-nouveau
parentea1786ec5b1385fe26927e206ca81d87ca70ca6a (diff)
gallium: Use debugging helper in all drm targets
Diffstat (limited to 'src/gallium/targets/dri-nouveau')
-rw-r--r--src/gallium/targets/dri-nouveau/Makefile5
-rw-r--r--src/gallium/targets/dri-nouveau/target.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile
index bf594ce483..2f64f312b8 100644
--- a/src/gallium/targets/dri-nouveau/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -6,6 +6,8 @@ LIBNAME = nouveau_dri.so
PIPE_DRIVERS = \
$(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
+ $(TOP)/src/gallium/drivers/trace/libtrace.a \
+ $(TOP)/src/gallium/drivers/rbug/librbug.a \
$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
@@ -15,6 +17,9 @@ C_SOURCES = \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
+DRIVER_DEFINES = \
+ -DGALLIUM_RBUG -DGALLIUM_TRACE
+
include ../Makefile.dri
DRI_LIB_DEPS += $(shell pkg-config libdrm_nouveau --libs)
diff --git a/src/gallium/targets/dri-nouveau/target.c b/src/gallium/targets/dri-nouveau/target.c
index ca3ec53029..e725a4d9b7 100644
--- a/src/gallium/targets/dri-nouveau/target.c
+++ b/src/gallium/targets/dri-nouveau/target.c
@@ -1,4 +1,5 @@
+#include "target-helpers/inline_debug_helper.h"
#include "state_tracker/drm_driver.h"
#include "nouveau/drm/nouveau_drm_public.h"
@@ -11,6 +12,8 @@ create_screen(int fd)
if (!screen)
return NULL;
+ screen = debug_screen_wrap(screen);
+
return screen;
}