projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '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 dba8cd7c6535a5de4733df9e0efb3a48eb17a1cf..05ff9ef61f1e9820ebb144855bbe6e60a2b2c722 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_screen.h"
-#include "
pipe/p
_thread.h"
+#include "
os/os
_thread.h"
#ifdef __cplusplus
#ifdef __cplusplus
@@
-48,7
+48,7
@@
struct tr_list {
* without mapping/unmapping. This flag marks user buffers, so that their
* contents can be dumpped before being used by the pipe context.
*/
* without mapping/unmapping. This flag marks user buffers, so that their
* contents can be dumpped before being used by the pipe context.
*/
-#define TRACE_
BUFFER_USAGE_US
ER (1 << 31)
+#define TRACE_
FLAG_USER_BUFF
ER (1 << 31)
struct trace_screen
struct trace_screen
@@
-56,6
+56,7
@@
struct trace_screen
struct pipe_screen base;
struct pipe_screen *screen;
struct pipe_screen base;
struct pipe_screen *screen;
+ struct pipe_context *private_context;
/* remote debugger */
struct trace_rbug *rbug;
/* remote debugger */
struct trace_rbug *rbug;
@@
-99,13
+100,6
@@
trace_enabled(void);
struct trace_screen *
trace_screen(struct pipe_screen *screen);
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);
-
#define trace_screen_add_to_list(tr_scr, name, obj) \
do { \
pipe_mutex_lock(tr_scr->list_mutex); \
#define trace_screen_add_to_list(tr_scr, name, obj) \
do { \
pipe_mutex_lock(tr_scr->list_mutex); \