mesa/gallium: automatically lower alpha-testing

[mesa.git] / src / mesa / state_tracker / st_context.h

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 50c4a1f28b2b897f5bbe0b90b51662eb5949f986..99f43828f445b7962498299f549e365bd017ca58 100644 (file)
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -147,6 +147,8 @@ struct st_context
    boolean needs_rgb_dst_alpha_override;
    boolean can_bind_const_buffer_as_vertex;
    boolean has_signed_vertex_buffer_offset;
+   boolean lower_flatshade;
+   boolean lower_alpha_test;
 
    /**
     * If a shader can be created when we get its source.
@@ -222,12 +224,18 @@ struct st_context
    GLboolean vertdata_edgeflags;
    GLboolean edgeflag_culls_prims;
 
+   /**
+    * The number of currently active queries (excluding timer queries).
+    * This is used to know if we need to pause any queries for meta ops.
+    */
+   unsigned active_queries;
+
    struct st_vertex_program *vp;    /**< Currently bound vertex program */
    struct st_fragment_program *fp;  /**< Currently bound fragment program */
    struct st_common_program *gp;  /**< Currently bound geometry program */
    struct st_common_program *tcp; /**< Currently bound tess control program */
    struct st_common_program *tep; /**< Currently bound tess eval program */
-   struct st_compute_program *cp;   /**< Currently bound compute program */
+   struct st_common_program *cp;   /**< Currently bound compute program */
 
    struct st_vp_variant *vp_variant;
 
@@ -331,12 +339,12 @@ struct st_context
 
    struct {
       struct st_zombie_sampler_view_node list;
-      mtx_t mutex;
+      simple_mtx_t mutex;
    } zombie_sampler_views;
 
    struct {
       struct st_zombie_shader_node list;
-      mtx_t mutex;
+      simple_mtx_t mutex;
    } zombie_shaders;
 
 };