gallium: Use debugging helper in all drm targets

diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index 24ef989ad2a7d679acb8586318f3033474af069a..26726b24a0528c037f51f89fc157f87394e7190d 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -17,6 +17,9 @@ C_SOURCES = \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 
+DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 include ../Makefile.dri
 
 DRI_LIB_DEPS += -ldrm_intel

diff --git a/src/gallium/targets/dri-i915/SConscript b/src/gallium/targets/dri-i915/SConscript
index 5da2a0a4036a59e4c34ea556c0da99aba10b3196..5659bc8027528050ef631c7e6e24f13a495c0716 100644 (file)
--- a/src/gallium/targets/dri-i915/SConscript
+++ b/src/gallium/targets/dri-i915/SConscript
@@ -8,6 +8,8 @@ env = drienv.Clone()
 
 env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
 
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
+
 env.Prepend(LIBS = [
     st_dri,
     i915drm,

diff --git a/src/gallium/targets/dri-i915/target.c b/src/gallium/targets/dri-i915/target.c
index a79238f3a0f422b3652fdbfaaeb8779d050f8ad2..8c8ef7e02b4c4a9bde2c34adf43778c97c00c42f 100644 (file)
--- a/src/gallium/targets/dri-i915/target.c
+++ b/src/gallium/targets/dri-i915/target.c
@@ -1,5 +1,6 @@
 
 #include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "i915/drm/i915_drm_public.h"
 #include "i915/i915_public.h"
 
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct i915_winsys *iws;
+   struct pipe_screen *screen;
+
    iws = i915_drm_winsys_create(fd);
    if (!iws)
       return NULL;
 
-   return i915_screen_create(iws);
+   screen = i915_screen_create(iws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen)

diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile
index 76350caf9d7cb0b968e3d1d37c58b4dd52336c45..3679c075b24666fce1ddfab27f17860de39e0553 100644 (file)
--- a/src/gallium/targets/dri-i965/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -18,7 +18,7 @@ C_SOURCES = \
        $(DRIVER_SOURCES)
 
 DRIVER_DEFINES = \
-       -DGALLIUM_SOFTPIPE
+       -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE
 
 include ../Makefile.dri
 

diff --git a/src/gallium/targets/dri-i965/SConscript b/src/gallium/targets/dri-i965/SConscript
index da1a8654a8699c847bf7b6955777f89ed654f556..7eb3c436a322db75506f2a0ee6d5c8c6cdfb7928 100644 (file)
--- a/src/gallium/targets/dri-i965/SConscript
+++ b/src/gallium/targets/dri-i965/SConscript
@@ -8,7 +8,11 @@ env = drienv.Clone()
 
 env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
 
-env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
+env.Append(CPPDEFINES = [
+    'GALLIUM_SOFTPIPE',
+    'GALLIUM_RBUG',
+    'GALLIUM_TRACE'
+])
 
 env.Prepend(LIBS = [
     st_dri,

diff --git a/src/gallium/targets/dri-i965/target.c b/src/gallium/targets/dri-i965/target.c
index 36424c60a119a51427023901b622baa2e596e676..ce97f8202780ea49d20e1fe1ead76300d66a2a50 100644 (file)
--- a/src/gallium/targets/dri-i965/target.c
+++ b/src/gallium/targets/dri-i965/target.c
@@ -1,5 +1,6 @@
 
 #include "target-helpers/inline_wrapper_sw_helper.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "i965/drm/i965_drm_public.h"
 #include "i965/brw_public.h"
@@ -21,6 +22,8 @@ create_screen(int fd)
    if (debug_get_bool_option("BRW_SOFTPIPE", FALSE))
       screen = sw_screen_wrap(screen);
 
+   screen = debug_screen_wrap(screen);
+
    return screen;
 }
 

diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile
index bf594ce483e35f471cedc604734dfb642d069667..2f64f312b841cdad42c8f7120ddd8ac10fd4a5b4 100644 (file)
--- 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 ca3ec53029a464c06d18e3ed53eb5574dd0511bb..e725a4d9b7a427229ff0119f14608a2a110dd8e4 100644 (file)
--- 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;
 }
 

diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile
index 136fbb260b474f29ab0d838af6d7a8c1dd8ca120..932303d194efd123f03202f52a617e1218526aa9 100644 (file)
--- a/src/gallium/targets/dri-r600/Makefile
+++ b/src/gallium/targets/dri-r600/Makefile
@@ -16,6 +16,9 @@ C_SOURCES = \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 
+DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 include ../Makefile.dri
 
 DRI_LIB_DEPS += -ldrm_radeon

diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript
index d24251673c610b0e96fcd3d37bbab1ca12c27785..97c5df01fe27447be3e43cc4e0217f0d7f1bec0a 100644 (file)
--- a/src/gallium/targets/dri-r600/SConscript
+++ b/src/gallium/targets/dri-r600/SConscript
@@ -8,6 +8,8 @@ env = drienv.Clone()
 
 env.ParseConfig('pkg-config --cflags --libs libdrm_radeon')
 
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
+
 env.Prepend(LIBS = [
     st_dri,
     r600drm,

diff --git a/src/gallium/targets/dri-r600/target.c b/src/gallium/targets/dri-r600/target.c
index 40ad8a09ca87202f7cdc944a75352f53a1ddb780..a01f4ed49fd872a2d651960cc2bd10c6af768d92 100644 (file)
--- a/src/gallium/targets/dri-r600/target.c
+++ b/src/gallium/targets/dri-r600/target.c
@@ -1,5 +1,6 @@
 
 #include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "r600/drm/r600_drm_public.h"
 #include "r600/r600_public.h"
 
@@ -17,6 +18,8 @@ create_screen(int fd)
    if (!screen)
       return NULL;
 
+   screen = debug_screen_wrap(screen);
+
    return screen;
 }
 

diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-radeong/Makefile
index d67d7d7ac23c348fe2aaec74873c5ef03b1fd1e7..28647540b0a2afa783cb7f55de499d6b2d1583cc 100644 (file)
--- a/src/gallium/targets/dri-radeong/Makefile
+++ b/src/gallium/targets/dri-radeong/Makefile
@@ -16,6 +16,9 @@ C_SOURCES = \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 
+DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 include ../Makefile.dri
 
 DRI_LIB_DEPS += -ldrm_radeon

diff --git a/src/gallium/targets/dri-radeong/SConscript b/src/gallium/targets/dri-radeong/SConscript
index c1d4eeecee6026c4a3b315283f39a066a0bfc1d3..ffac73af84e37b474437b3ae01466f496aa170fc 100644 (file)
--- a/src/gallium/targets/dri-radeong/SConscript
+++ b/src/gallium/targets/dri-radeong/SConscript
@@ -8,6 +8,8 @@ env = drienv.Clone()
 
 env.ParseConfig('pkg-config --cflags --libs libdrm_radeon')
 
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
+
 env.Prepend(LIBS = [
     st_dri,
     radeonwinsys,

diff --git a/src/gallium/targets/dri-radeong/target.c b/src/gallium/targets/dri-radeong/target.c
index 2c1beb633ef7736b3f363fa1e1904b499db339fb..5a0a8dc573839bb2ec6f7213371fc83bd9e19e4d 100644 (file)
--- a/src/gallium/targets/dri-radeong/target.c
+++ b/src/gallium/targets/dri-radeong/target.c
@@ -1,4 +1,5 @@
 
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "r300/r300_public.h"
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct r300_winsys_screen *sws;
+   struct pipe_screen *screen;
+
    sws = r300_drm_winsys_screen_create(fd);
    if (!sws)
       return NULL;
 
-   return r300_screen_create(sws);
+   screen = r300_screen_create(sws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("radeon", "radeon", create_screen)

diff --git a/src/gallium/targets/dri-vmwgfx/Makefile b/src/gallium/targets/dri-vmwgfx/Makefile
index 8e3cd6ff28a4e5f4fe9e88ef38d0af5e2f913c85..97c703b3739f2518099d7e135d3fb42bca1f22d6 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/Makefile
+++ b/src/gallium/targets/dri-vmwgfx/Makefile
@@ -14,6 +14,9 @@ C_SOURCES = \
        target.c \
        $(COMMON_GALLIUM_SOURCES)
 
+DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 include ../Makefile.dri
 
 symlinks:

diff --git a/src/gallium/targets/dri-vmwgfx/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript
index 3d0c5495da193b5ae4dab37f299ed76dbd65e2eb..7afabc7429f71d696734b7df3435629b1486bb33 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/SConscript
+++ b/src/gallium/targets/dri-vmwgfx/SConscript
@@ -6,6 +6,8 @@ if not 'svga' in env['drivers']:
 
 env = drienv.Clone()
 
+env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
+
 env.Prepend(LIBS = [
     st_dri,
     svgadrm,

diff --git a/src/gallium/targets/dri-vmwgfx/target.c b/src/gallium/targets/dri-vmwgfx/target.c
index 5f69653582db72dc0b74af448b3fdde1f30b8f3b..15089d6db264a20126697f4aeb6ee36e2c627e97 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/target.c
+++ b/src/gallium/targets/dri-vmwgfx/target.c
@@ -1,4 +1,5 @@
 
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "svga/drm/svga_drm_public.h"
 #include "svga/svga_public.h"
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct svga_winsys_screen *sws;
+   struct pipe_screen *screen;
+
    sws = svga_drm_winsys_screen_create(fd);
    if (!sws)
       return NULL;
 
-   return svga_screen_create(sws);
+   screen = svga_screen_create(sws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("vmwgfx", "vmwgfx", create_screen)

diff --git a/src/gallium/targets/egl-i915/Makefile b/src/gallium/targets/egl-i915/Makefile
index a118f169299154d32340de31ae437bc2b7d76ebf..c3ffe78029d88f7a7481368040a97cef9b5a283c 100644 (file)
--- a/src/gallium/targets/egl-i915/Makefile
+++ b/src/gallium/targets/egl-i915/Makefile
@@ -5,6 +5,9 @@ EGL_DRIVER_NAME = i915
 EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_intel
 
+EGL_DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \

diff --git a/src/gallium/targets/egl-i915/target.c b/src/gallium/targets/egl-i915/target.c
index 288771664347ec5d7825efbe718aed7e3bf8250a..070e2c0964866521bd182d1f4d70709d134be05d 100644 (file)
--- a/src/gallium/targets/egl-i915/target.c
+++ b/src/gallium/targets/egl-i915/target.c
@@ -1,5 +1,6 @@
 
 #include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "i915/drm/i915_drm_public.h"
 #include "i915/i915_public.h"
 
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct i915_winsys *iws;
+   struct pipe_screen *screen;
+
    iws = i915_drm_winsys_create(fd);
    if (!iws)
       return NULL;
 
-   return i915_screen_create(iws);
+   screen = i915_screen_create(iws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen)

diff --git a/src/gallium/targets/egl-i965/Makefile b/src/gallium/targets/egl-i965/Makefile
index fe3091190c1f4052964e830aad694d90034e25ef..44e435452e8315e2948a4b4a5a65a5969ec81cb2 100644 (file)
--- a/src/gallium/targets/egl-i965/Makefile
+++ b/src/gallium/targets/egl-i965/Makefile
@@ -6,7 +6,7 @@ EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_DEFINES = \
-       -DGALLIUM_SOFTPIPE
+       -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE
 
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \

diff --git a/src/gallium/targets/egl-i965/target.c b/src/gallium/targets/egl-i965/target.c
index ba1eeadd214c29c77c6187d0ad28b6f5ae133b57..1195b510a0719d4b76d1932a9417e552a015d8b8 100644 (file)
--- a/src/gallium/targets/egl-i965/target.c
+++ b/src/gallium/targets/egl-i965/target.c
@@ -1,5 +1,6 @@
 
 #include "target-helpers/inline_wrapper_sw_helper.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "i965/drm/i965_drm_public.h"
 #include "i965/brw_public.h"
@@ -21,6 +22,8 @@ create_screen(int fd)
    if (debug_get_bool_option("BRW_SOFTPIPE", FALSE))
       screen = sw_screen_wrap(screen);
 
+   screen = debug_screen_wrap(screen);
+
    return screen;
 }
 

diff --git a/src/gallium/targets/egl-nouveau/Makefile b/src/gallium/targets/egl-nouveau/Makefile
index 3f0a373e43b139a99387dd65fe0b984bcb237e14..0e16f11324660bdbb600f075272d03cbbc8ead7d 100644 (file)
--- a/src/gallium/targets/egl-nouveau/Makefile
+++ b/src/gallium/targets/egl-nouveau/Makefile
@@ -5,8 +5,13 @@ EGL_DRIVER_NAME = nouveau
 EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_nouveau
 
+EGL_DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 EGL_DRIVER_PIPES = \
        $(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

diff --git a/src/gallium/targets/egl-nouveau/target.c b/src/gallium/targets/egl-nouveau/target.c
index 7d0b141e5a27e597ae54f5d4b26560d9fc22b109..cf569ea62c89c0452897b5350202b894efceb9fe 100644 (file)
--- a/src/gallium/targets/egl-nouveau/target.c
+++ b/src/gallium/targets/egl-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;
 }
 

diff --git a/src/gallium/targets/egl-radeon/Makefile b/src/gallium/targets/egl-radeon/Makefile
index c988b48cd04c2b5c9934b6f711cf91ed74c17fa8..2adc027b8f05a20e6e6a129defb21ce5bdd974b3 100644 (file)
--- a/src/gallium/targets/egl-radeon/Makefile
+++ b/src/gallium/targets/egl-radeon/Makefile
@@ -5,6 +5,9 @@ EGL_DRIVER_NAME = radeon
 EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_radeon
 
+EGL_DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \

diff --git a/src/gallium/targets/egl-radeon/target.c b/src/gallium/targets/egl-radeon/target.c
index 5117eb86f9fadf7739f95c4c64af47dff018531c..ce07327b8fca703e82322cac79a50a070908b8d5 100644 (file)
--- a/src/gallium/targets/egl-radeon/target.c
+++ b/src/gallium/targets/egl-radeon/target.c
@@ -1,4 +1,5 @@
 
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "r300/r300_public.h"
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct r300_winsys_screen *sws;
+   struct pipe_screen *screen;
+
    sws = r300_drm_winsys_screen_create(fd);
    if (!sws)
       return NULL;
 
-   return r300_screen_create(sws);
+   screen = r300_screen_create(sws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("radeon", "radeon", create_screen)

diff --git a/src/gallium/targets/egl-vmwgfx/Makefile b/src/gallium/targets/egl-vmwgfx/Makefile
index a25bf8885d4acb5fad8006d7a2cfe031544c8d31..92ec4cbdd619f51ee7bc597b444ac330e9167484 100644 (file)
--- a/src/gallium/targets/egl-vmwgfx/Makefile
+++ b/src/gallium/targets/egl-vmwgfx/Makefile
@@ -5,6 +5,9 @@ EGL_DRIVER_NAME = vmwgfx
 EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS =
 
+EGL_DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
+
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \

diff --git a/src/gallium/targets/egl-vmwgfx/target.c b/src/gallium/targets/egl-vmwgfx/target.c
index 7dd0bb0dc2c3e13a0022116a57878dcb0dfc0414..4e9f51c5dc4bc9762da21b1a199d56451e6f1b84 100644 (file)
--- a/src/gallium/targets/egl-vmwgfx/target.c
+++ b/src/gallium/targets/egl-vmwgfx/target.c
@@ -1,4 +1,5 @@
 
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "svga/drm/svga_drm_public.h"
 #include "svga/svga_public.h"
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct svga_winsys_screen *sws;
+   struct pipe_screen *screen;
+
    sws = svga_drm_winsys_screen_create(fd);
    if (!sws)
       return NULL;
 
-   return svga_screen_create(sws);
+   screen = svga_screen_create(sws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("vmwgfx", "vmwgfx", create_screen)

diff --git a/src/gallium/targets/xorg-i915/Makefile b/src/gallium/targets/xorg-i915/Makefile
index 4f9202b0520b58e104dd5cd87f083202e5e50e40..3ab7285fb935aa0db88c04ba4d0d41d1fe6bd69a 100644 (file)
--- a/src/gallium/targets/xorg-i915/Makefile
+++ b/src/gallium/targets/xorg-i915/Makefile
@@ -8,7 +8,7 @@ C_SOURCES = \
        intel_xorg.c
 
 DRIVER_DEFINES = \
-       -DHAVE_CONFIG_H
+       -DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE
 
 DRIVER_LINKS = \
        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \

diff --git a/src/gallium/targets/xorg-i915/intel_target.c b/src/gallium/targets/xorg-i915/intel_target.c
index a79238f3a0f422b3652fdbfaaeb8779d050f8ad2..8c8ef7e02b4c4a9bde2c34adf43778c97c00c42f 100644 (file)
--- a/src/gallium/targets/xorg-i915/intel_target.c
+++ b/src/gallium/targets/xorg-i915/intel_target.c
@@ -1,5 +1,6 @@
 
 #include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "i915/drm/i915_drm_public.h"
 #include "i915/i915_public.h"
 
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct i915_winsys *iws;
+   struct pipe_screen *screen;
+
    iws = i915_drm_winsys_create(fd);
    if (!iws)
       return NULL;
 
-   return i915_screen_create(iws);
+   screen = i915_screen_create(iws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen)

diff --git a/src/gallium/targets/xorg-i965/Makefile b/src/gallium/targets/xorg-i965/Makefile
index eede9f23254c0faf8b648d0fe2bd9b58ab661a33..9bb8252be20103da84e5044e172a4053a9ba66cb 100644 (file)
--- a/src/gallium/targets/xorg-i965/Makefile
+++ b/src/gallium/targets/xorg-i965/Makefile
@@ -8,7 +8,8 @@ C_SOURCES = \
        intel_xorg.c
 
 DRIVER_DEFINES = \
-       -DHAVE_CONFIG_H -DGALLIUM_SOFTPIPE
+       -DHAVE_CONFIG_H -DGALLIUM_SOFTPIPE \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE
 
 DRIVER_LINKS = \
        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \

diff --git a/src/gallium/targets/xorg-i965/intel_target.c b/src/gallium/targets/xorg-i965/intel_target.c
index 36424c60a119a51427023901b622baa2e596e676..ce97f8202780ea49d20e1fe1ead76300d66a2a50 100644 (file)
--- a/src/gallium/targets/xorg-i965/intel_target.c
+++ b/src/gallium/targets/xorg-i965/intel_target.c
@@ -1,5 +1,6 @@
 
 #include "target-helpers/inline_wrapper_sw_helper.h"
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "i965/drm/i965_drm_public.h"
 #include "i965/brw_public.h"
@@ -21,6 +22,8 @@ create_screen(int fd)
    if (debug_get_bool_option("BRW_SOFTPIPE", FALSE))
       screen = sw_screen_wrap(screen);
 
+   screen = debug_screen_wrap(screen);
+
    return screen;
 }
 

diff --git a/src/gallium/targets/xorg-nouveau/Makefile b/src/gallium/targets/xorg-nouveau/Makefile
index 066ec6a813001bf2fb068df03526c173b8ce9a73..93f53e63bfd8e5fc01c8fdb9727de44d5fde2a18 100644 (file)
--- a/src/gallium/targets/xorg-nouveau/Makefile
+++ b/src/gallium/targets/xorg-nouveau/Makefile
@@ -8,11 +8,13 @@ C_SOURCES = \
        nouveau_xorg.c
 
 DRIVER_DEFINES = \
-       -DHAVE_CONFIG_H
+       -DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE
 
 DRIVER_LINKS = \
        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.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 \

diff --git a/src/gallium/targets/xorg-nouveau/nouveau_target.c b/src/gallium/targets/xorg-nouveau/nouveau_target.c
index ca3ec53029a464c06d18e3ed53eb5574dd0511bb..e725a4d9b7a427229ff0119f14608a2a110dd8e4 100644 (file)
--- a/src/gallium/targets/xorg-nouveau/nouveau_target.c
+++ b/src/gallium/targets/xorg-nouveau/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;
 }
 

diff --git a/src/gallium/targets/xorg-radeon/Makefile b/src/gallium/targets/xorg-radeon/Makefile
index c438ec48473cfa6291db715dac285038a6519a36..ba7caea155c309f8a142c6fef41610fbcba50969 100644 (file)
--- a/src/gallium/targets/xorg-radeon/Makefile
+++ b/src/gallium/targets/xorg-radeon/Makefile
@@ -8,7 +8,7 @@ C_SOURCES = \
        radeon_xorg.c
 
 DRIVER_DEFINES = \
-       -DHAVE_CONFIG_H
+       -DHAVE_CONFIG_H -DGALLIUM_RBUG -DGALLIUM_TRACE
 
 DRIVER_LINKS = \
         $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \

diff --git a/src/gallium/targets/xorg-radeon/radeon_target.c b/src/gallium/targets/xorg-radeon/radeon_target.c
index 2c1beb633ef7736b3f363fa1e1904b499db339fb..5a0a8dc573839bb2ec6f7213371fc83bd9e19e4d 100644 (file)
--- a/src/gallium/targets/xorg-radeon/radeon_target.c
+++ b/src/gallium/targets/xorg-radeon/radeon_target.c
@@ -1,4 +1,5 @@
 
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "r300/r300_public.h"
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct r300_winsys_screen *sws;
+   struct pipe_screen *screen;
+
    sws = r300_drm_winsys_screen_create(fd);
    if (!sws)
       return NULL;
 
-   return r300_screen_create(sws);
+   screen = r300_screen_create(sws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("radeon", "radeon", create_screen)

diff --git a/src/gallium/targets/xorg-vmwgfx/Makefile b/src/gallium/targets/xorg-vmwgfx/Makefile
index 0cc9be212b4926a30e89284071b593f1c63f17c2..73a2cea232e49bf7e36c4a124b7a7e654376a321 100644 (file)
--- a/src/gallium/targets/xorg-vmwgfx/Makefile
+++ b/src/gallium/targets/xorg-vmwgfx/Makefile
@@ -16,8 +16,11 @@ DRIVER_INCLUDES = \
 
 DRIVER_DEFINES = \
        -std=gnu99 \
+       -DGALLIUM_RBUG \
+       -DGALLIUM_TRACE \
        -DHAVE_CONFIG_H
 
+
 DRIVER_LINKS = \
        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
        $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \

diff --git a/src/gallium/targets/xorg-vmwgfx/vmw_target.c b/src/gallium/targets/xorg-vmwgfx/vmw_target.c
index 5f69653582db72dc0b74af448b3fdde1f30b8f3b..15089d6db264a20126697f4aeb6ee36e2c627e97 100644 (file)
--- a/src/gallium/targets/xorg-vmwgfx/vmw_target.c
+++ b/src/gallium/targets/xorg-vmwgfx/vmw_target.c
@@ -1,4 +1,5 @@
 
+#include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "svga/drm/svga_drm_public.h"
 #include "svga/svga_public.h"
@@ -7,11 +8,19 @@ static struct pipe_screen *
 create_screen(int fd)
 {
    struct svga_winsys_screen *sws;
+   struct pipe_screen *screen;
+
    sws = svga_drm_winsys_screen_create(fd);
    if (!sws)
       return NULL;
 
-   return svga_screen_create(sws);
+   screen = svga_screen_create(sws);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("vmwgfx", "vmwgfx", create_screen)