gallium: move filter assignment out of loop

[mesa.git] / src / gallium / auxiliary / cso_cache / cso_cache.h

diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.h b/src/gallium/auxiliary/cso_cache/cso_cache.h
index f3bd4623c9390f71f4cabe45c766355ceeaad9f2..e5edbbb5566a3371fdfe51f25baef36b8607e45b 100644 (file)
--- a/src/gallium/auxiliary/cso_cache/cso_cache.h
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.h
@@ -28,7 +28,7 @@
  /**
   * @file
   * Constant State Object (CSO) cache.
-  * 
+  *
   * The basic idea is that the states are created via the
   * create_state/bind_state/delete_state semantics. The driver is expected to
   * perform as much of the Gallium state translation to whatever its internal
@@ -36,15 +36,15 @@
   * mechanism where it stores the created states. When the pipeline needs an
   * actual state change, a bind call is issued. In the bind call the driver
   * gets its already translated representation.
-  * 
+  *
   * Those semantics mean that the driver doesn't do the repeated translations
   * of states on every frame, but only once, when a new state is actually
   * created.
-  * 
+  *
   * Even on hardware that doesn't do any kind of state cache, it makes the
   * driver look a lot neater, plus it avoids all the redundant state
   * translations on every frame.
-  * 
+  *
   * Currently our constant state objects are:
   * - alpha test
   * - blend
@@ -53,7 +53,7 @@
   * - rasterizer (old setup)
   * - sampler
   * - vertex shader
-  * 
+  *
   * Things that are not constant state objects include:
   * - blend_color
   * - clip_state
@@ -65,7 +65,7 @@
   * - scissor_state
   * - texture_state
   * - viewport_state
-  * 
+  *
   * @author Zack Rusin <zack@tungstengraphics.com>
   */
 
@@ -75,65 +75,59 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 
-/* cso_hash.h is necessary for cso_hash_iter, as MSVC requires structures 
+/* cso_hash.h is necessary for cso_hash_iter, as MSVC requires structures
  * returned by value to be fully defined */
-#include "cso_hash.h" 
+#include "cso_hash.h"
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-  
-struct cso_cache {
-   struct cso_hash *blend_hash;
-   struct cso_hash *depth_stencil_hash;
-   struct cso_hash *fs_hash;
-   struct cso_hash *vs_hash;
-   struct cso_hash *rasterizer_hash;
-   struct cso_hash *sampler_hash;
-};
+typedef void (*cso_state_callback)(void *ctx, void *obj);
+
+struct cso_cache;
 
 struct cso_blend {
    struct pipe_blend_state state;
-   void   *data;
-   void   (*delete_state)(void *, void  *);
-   void   *context;
+   void *data;
+   cso_state_callback delete_state;
+   struct pipe_context *context;
 };
 
 struct cso_depth_stencil_alpha {
    struct pipe_depth_stencil_alpha_state state;
    void *data;
-   void   (*delete_state)(void *, void  *);
-   void   *context;
+   cso_state_callback delete_state;
+   struct pipe_context *context;
 };
 
 struct cso_rasterizer {
    struct pipe_rasterizer_state state;
    void *data;
-   void   (*delete_state)(void *, void  *);
-   void   *context;
+   cso_state_callback delete_state;
+   struct pipe_context *context;
 };
 
 struct cso_fragment_shader {
    struct pipe_shader_state state;
    void *data;
-   void   (*delete_state)(void *, void  *);
-   void   *context;
+   cso_state_callback delete_state;
+   struct pipe_context *context;
 };
 
 struct cso_vertex_shader {
    struct pipe_shader_state state;
    void *data;
-   void   (*delete_state)(void *, void  *);
-   void   *context;
+   cso_state_callback delete_state;
+   struct pipe_context *context;
 };
 
 struct cso_sampler {
    struct pipe_sampler_state state;
    void *data;
-   void   (*delete_state)(void *, void  *);
-   void   *context;
+   cso_state_callback delete_state;
+   struct pipe_context *context;
 };
 
 
@@ -160,10 +154,12 @@ struct cso_hash_iter cso_find_state_template(struct cso_cache *sc,
                                              unsigned hash_key, enum cso_cache_type type,
                                              void *templ);
 void cso_for_each_state(struct cso_cache *sc, enum cso_cache_type type,
-                        void (*func)(void *state, void *user_data), void *user_data);
+                        cso_state_callback func, void *user_data);
 void * cso_take_state(struct cso_cache *sc, unsigned hash_key,
                       enum cso_cache_type type);
 
+void cso_set_maximum_cache_size(struct cso_cache *sc, int number);
+int cso_maximum_cache_size(const struct cso_cache *sc);
 
 #ifdef __cplusplus
 }