3 files changed, 15 insertions, 1 deletions
diff --git a/src/gallium/targets/dri-vmwgfx/Makefile b/src/gallium/targets/dri-vmwgfx/Makefile
index 8e3cd6ff28a..97c703b3739 100644
--- 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 3d0c5495da1..7afabc7429f 100644
--- 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 5f69653582d..15089d6db26 100644
--- 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)