1 files changed, 2 insertions, 26 deletions

diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index ffae6e94d1..32e519a68a 100644
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -40,7 +40,6 @@
 
 
 static boolean trace = FALSE;
-static boolean rbug = FALSE;
 
 static const char *
 trace_screen_get_name(struct pipe_screen *_screen)
@@ -86,7 +85,7 @@ trace_screen_get_vendor(struct pipe_screen *_screen)
 
 static int
 trace_screen_get_param(struct pipe_screen *_screen,
-                       int param)
+                       enum pipe_cap param)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
@@ -109,7 +108,7 @@ trace_screen_get_param(struct pipe_screen *_screen,
 
 static float
 trace_screen_get_paramf(struct pipe_screen *_screen,
-                        int param)
+                        enum pipe_cap param)
 {
    struct trace_screen *tr_scr = trace_screen(_screen);
    struct pipe_screen *screen = tr_scr->screen;
@@ -494,9 +493,6 @@ trace_screen_destroy(struct pipe_screen *_screen)
    trace_dump_call_end();
    trace_dump_trace_end();
 
-   if (tr_scr->rbug)
-      trace_rbug_stop(tr_scr->rbug);
-
    screen->destroy(screen);
 
    FREE(tr_scr);
@@ -518,11 +514,6 @@ trace_enabled(void)
       trace = TRUE;
    }
 
-   if (debug_get_bool_option("GALLIUM_RBUG", FALSE)) {
-      trace = TRUE;
-      rbug = TRUE;
-   }
-
    return trace;
 }
 
@@ -551,13 +542,6 @@ trace_screen_create(struct pipe_screen *screen)
 #else
    winsys = screen->winsys;
 #endif
-   pipe_mutex_init(tr_scr->list_mutex);
-   make_empty_list(&tr_scr->buffers);
-   make_empty_list(&tr_scr->contexts);
-   make_empty_list(&tr_scr->textures);
-   make_empty_list(&tr_scr->surfaces);
-   make_empty_list(&tr_scr->transfers);
-
    tr_scr->base.winsys = winsys;
    tr_scr->base.destroy = trace_screen_destroy;
    tr_scr->base.get_name = trace_screen_get_name;
@@ -580,20 +564,12 @@ trace_screen_create(struct pipe_screen *screen)
    tr_scr->base.flush_frontbuffer = trace_screen_flush_frontbuffer;
 
    tr_scr->screen = screen;
-   tr_scr->private_context = screen->context_create(screen, NULL);
-   if (tr_scr->private_context == NULL)
-      goto error3;
 
    trace_dump_ret(ptr, screen);
    trace_dump_call_end();
 
-   if (rbug)
-      tr_scr->rbug = trace_rbug_start(tr_scr);
-
    return &tr_scr->base;
 
-error3:
-   FREE(tr_scr);
 error2:
    trace_dump_ret(ptr, screen);
    trace_dump_call_end();