X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ftrace%2Ftr_screen.h;h=65ea4fb6a43f0cf9c6a6a4d71a82b85e66d18122;hb=2aa1197eee442ab960f6ad6b84d4cf58511d6cb7;hp=9bfbe72e2c0d651dbb758f2ad8ebadcd043b26f5;hpb=b43c182f19c6291c88420fa12714f952c2b461fb;p=mesa.git

diff --git a/src/gallium/drivers/trace/tr_screen.h b/src/gallium/drivers/trace/tr_screen.h
index 9bfbe72e2c0..65ea4fb6a43 100644
--- a/src/gallium/drivers/trace/tr_screen.h
+++ b/src/gallium/drivers/trace/tr_screen.h
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -38,17 +38,12 @@ extern "C" {
 #endif
 
 
-struct tr_list {
-   struct tr_list *next;
-   struct tr_list *prev;
-};
-
 /**
  * It often happens that new data is written directly to the user buffers
  * without mapping/unmapping. This flag marks user buffers, so that their
- * contents can be dumpped before being used by the pipe context.
+ * contents can be dumped before being used by the pipe context.
  */
-#define TRACE_BUFFER_USAGE_USER  (1 << 31)
+#define TRACE_FLAG_USER_BUFFER  (1 << 31)
 
 
 struct trace_screen
@@ -56,70 +51,12 @@ 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;
-   int num_contexts;
-   int num_textures;
-   int num_surfaces;
-   int num_transfers;
-   struct tr_list buffers;
-   struct tr_list contexts;
-   struct tr_list textures;
-   struct tr_list surfaces;
-   struct tr_list transfers;
 };
 
 
-/*
- * 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);
 
-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);          \
-      insert_at_head(&tr_scr->name, &obj->list);    \
-      tr_scr->num_##name++;                         \
-      pipe_mutex_unlock(tr_scr->list_mutex);        \
-   } while (0)
-
-#define trace_screen_remove_from_list(tr_scr, name, obj) \
-   do {                                                  \
-      pipe_mutex_lock(tr_scr->list_mutex);               \
-      remove_from_list(&obj->list);                      \
-      tr_scr->num_##name--;                              \
-      pipe_mutex_unlock(tr_scr->list_mutex);             \
-   } while (0)
-
 
 #ifdef __cplusplus
 }