softpipe: Convert to comma-separated SOFTPIPE_DEBUG for debug options.

[mesa.git] / src / gallium / drivers / softpipe / sp_context.h

diff --git a/src/gallium/drivers/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h
index 7ce4dc3560dc17621360457537a0cc9a279d7287..d4be1efc945a9db16e65a1202cd5f3a1f7767158 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_context.h
+++ b/src/gallium/drivers/softpipe/sp_context.h
@@ -94,7 +94,7 @@ struct softpipe_context {
    struct draw_so_target *so_targets[PIPE_MAX_SO_BUFFERS];
    unsigned num_so_targets;
    
-   struct pipe_query_data_so_statistics so_stats;
+   struct pipe_query_data_so_statistics so_stats[PIPE_MAX_VERTEX_STREAMS];
 
    struct pipe_query_data_pipeline_statistics pipeline_statistics;
    unsigned active_statistics_queries;
@@ -132,7 +132,7 @@ struct softpipe_context {
    /** Which vertex shader output slot contains layer */
    int8_t layer_slot;
 
-   /** The reduced version of the primitive supplied by the state tracker */
+   /** The reduced version of the primitive supplied by the gallium frontend */
    unsigned reduced_api_prim;
 
    /** Derived information about which winding orders to cull */
@@ -148,12 +148,10 @@ struct softpipe_context {
    /** Derived from scissor and surface bounds: */
    struct pipe_scissor_state cliprect[PIPE_MAX_VIEWPORTS];
 
-   unsigned line_stipple_counter;
-
    /** Conditional query object and mode */
    struct pipe_query *render_cond_query;
-   uint render_cond_mode;
-   boolean render_cond_cond;
+   enum pipe_render_cond_flag render_cond_mode;
+   bool render_cond_cond;
 
    /** Polygon stipple items */
    struct {
@@ -206,11 +204,6 @@ struct softpipe_context {
     * of sp_sampler_view?
     */
    struct softpipe_tex_tile_cache *tex_cache[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];
-
-   unsigned dump_fs : 1;
-   unsigned dump_gs : 1;
-   unsigned dump_cs : 1;
-   unsigned no_rast : 1;
 };