Merge remote branch 'origin/7.8'

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

diff --git a/src/gallium/drivers/trace/tr_screen.h b/src/gallium/drivers/trace/tr_screen.h
index 7fae18298580e9d87bed0de281a8bd5090b657e1..9bfbe72e2c0d651dbb758f2ad8ebadcd043b26f5 100644 (file)
--- a/src/gallium/drivers/trace/tr_screen.h
+++ b/src/gallium/drivers/trace/tr_screen.h
@@ -30,7 +30,7 @@
 
 
 #include "pipe/p_screen.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 
 
 #ifdef __cplusplus
@@ -56,6 +56,10 @@ struct trace_screen
    struct pipe_screen base;
 
    struct pipe_screen *screen;
+   struct pipe_context *private_context;
+
+   /* remote debugger */
+   struct trace_rbug *rbug;
 
    pipe_mutex list_mutex;
    int num_buffers;
@@ -71,21 +75,31 @@ struct trace_screen
 };
 
 
+/*
+ * tr_rbug.c
+ */
+
+
+struct trace_rbug;
+
+struct trace_rbug *
+trace_rbug_start(struct trace_screen *tr_scr);
+
+void
+trace_rbug_stop(struct trace_rbug *tr_rbug);
+
+
 /*
  * tr_screen.c
  */
 
+
 boolean
 trace_enabled(void);
 
 struct trace_screen *
 trace_screen(struct pipe_screen *screen);
 
-
-struct pipe_screen *
-trace_screen_create(struct pipe_screen *screen);
-
-
 void
 trace_screen_user_buffer_update(struct pipe_screen *screen,
                                 struct pipe_buffer *buffer);
@@ -106,6 +120,7 @@ trace_screen_user_buffer_update(struct pipe_screen *screen,
       pipe_mutex_unlock(tr_scr->list_mutex);             \
    } while (0)
 
+
 #ifdef __cplusplus
 }
 #endif