gallium: s/unsigned/enum pipe_shader_type/ for pipe_screen::get_shader_param()

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

diff --git a/src/gallium/drivers/trace/tr_context.h b/src/gallium/drivers/trace/tr_context.h
index 1b4121d80a917013afc0802b1a7c419a606f89af..ad57d9d5243e74575de7c0e6f074af6761cd162e 100644 (file)
--- a/src/gallium/drivers/trace/tr_context.h
+++ b/src/gallium/drivers/trace/tr_context.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.
@@ -47,52 +47,20 @@ struct trace_context
    struct pipe_context base;
 
    struct pipe_context *pipe;
+};
 
-   /* current state */
-   struct {
-      struct trace_shader *fs;
-      struct trace_shader *vs;
-
-      struct trace_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];
-      unsigned num_sampler_views;
-
-      struct trace_sampler_view *vert_sampler_views[PIPE_MAX_VERTEX_SAMPLERS];
-      unsigned num_vert_sampler_views;
-
-      unsigned nr_cbufs;
-      struct trace_resource *cbufs[PIPE_MAX_COLOR_BUFS];
-      struct trace_resource *zsbuf;
-   } curr;
-
-   struct {
-      struct trace_shader *fs;
-      struct trace_shader *vs;
-
-      struct trace_sampler_view *sampler_view;
-      struct trace_resource *surf;
-
-      int blocker;
-   } draw_rule;
-   unsigned draw_num_rules;
-   pipe_condvar draw_cond;
-   pipe_mutex draw_mutex;
-   int draw_blocker;
-   int draw_blocked;
-
-   /* for list on screen */
-   struct tr_list list;
 
-   /* list of state objects */
-   pipe_mutex list_mutex;
-   unsigned num_shaders;
-   struct tr_list shaders;
-};
+void
+trace_context_check(const struct pipe_context *pipe);
 
 
-static INLINE struct trace_context *
+static inline struct trace_context *
 trace_context(struct pipe_context *pipe)
 {
    assert(pipe);
+#ifdef DEBUG
+   trace_context_check(pipe);
+#endif
    return (struct trace_context *)pipe;
 }
 
@@ -101,9 +69,6 @@ struct pipe_context *
 trace_context_create(struct trace_screen *tr_scr,
                      struct pipe_context *pipe);
 
-void
-trace_rbug_notify_draw_blocked(struct trace_context *tr_ctx);
-
 
 #ifdef __cplusplus
 }