softpipe: Include missing header in sp_flush.c.

[mesa.git] / src / gallium / drivers / trace / tr_screen.c

diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index dbd10c6f76190be1703df518bf9b92d75cbc5ee2..32e519a68a094e0263ef50aa145f74d4605ac94a 100644 (file)
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -36,12 +36,10 @@
 #include "tr_screen.h"
 #include "tr_public.h"
 
-#include "util/u_inlines.h"
 #include "pipe/p_format.h"
 
 
 static boolean trace = FALSE;
-static boolean rbug = FALSE;
 
 static const char *
 trace_screen_get_name(struct pipe_screen *_screen)
@@ -87,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;
@@ -110,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;
@@ -135,6 +133,7 @@ static boolean
 trace_screen_is_format_supported(struct pipe_screen *_screen,
                                  enum pipe_format format,
                                  enum pipe_texture_target target,
+                                 unsigned sample_count,
                                  unsigned tex_usage,
                                  unsigned geom_flags)
 {
@@ -147,10 +146,12 @@ trace_screen_is_format_supported(struct pipe_screen *_screen,
    trace_dump_arg(ptr, screen);
    trace_dump_arg(format, format);
    trace_dump_arg(int, target);
+   trace_dump_arg(uint, sample_count);
    trace_dump_arg(uint, tex_usage);
    trace_dump_arg(uint, geom_flags);
 
-   result = screen->is_format_supported(screen, format, target, tex_usage, geom_flags);
+   result = screen->is_format_supported(screen, format, target, sample_count,
+                                        tex_usage, geom_flags);
 
    trace_dump_ret(bool, result);
 
@@ -223,7 +224,7 @@ trace_screen_resource_create(struct pipe_screen *_screen,
    trace_dump_call_begin("pipe_screen", "resource_create");
 
    trace_dump_arg(ptr, screen);
-   trace_dump_arg(template, templat);
+   trace_dump_arg(resource_template, templat);
 
    result = screen->resource_create(screen, templat);
 
@@ -492,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);
@@ -516,11 +514,6 @@ trace_enabled(void)
       trace = TRUE;
    }
 
-   if (debug_get_bool_option("GALLIUM_RBUG", FALSE)) {
-      trace = TRUE;
-      rbug = TRUE;
-   }
-
    return trace;
 }
 
@@ -549,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;
@@ -578,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();