Implementing a better hash, removing state_tracker dependency from the cache.

Replacing mesa's main hash with one that handles collisions, moving state_tracker
related caching to the state tracker to keep cso cache independent of it. Cleanups.

5 files changed, 110 insertions, 6 deletions

diff --git a/src/mesa/state_tracker/st_atom_blend.c b/src/mesa/state_tracker/st_atom_blend.c
index d007d50ad3..d94beb66c7 100644
--- a/src/mesa/state_tracker/st_atom_blend.c
+++ b/src/mesa/state_tracker/st_atom_blend.c
@@ -33,10 +33,11 @@
  
 
 #include "st_context.h"
+#include "st_cache.h"
 #include "st_atom.h"
+
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "cso_cache/cso_cache.h"
 
 
 /**
@@ -211,7 +212,7 @@ update_blend( struct st_context *st )
       blend.dither = 1;
 
    struct pipe_blend_state *real_blend =
-      cso_cached_blend_state(st, &blend);
+      st_cached_blend_state(st, &blend);
 
    if (st->state.blend != real_blend) {
       /* state has changed */
diff --git a/src/mesa/state_tracker/st_cache.c b/src/mesa/state_tracker/st_cache.c
new file mode 100644
index 0000000000..0205b1cab3
--- /dev/null
+++ b/src/mesa/state_tracker/st_cache.c
@@ -0,0 +1,61 @@
+/**************************************************************************
+ *
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * 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
+ * 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.
+ *
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Zack Rusin <zack@tungstengraphics.com>
+  */
+
+#include "st_cache.h"
+
+#include "st_context.h"
+
+#include "pipe/p_state.h"
+
+#include "cso_cache/cso_cache.h"
+#include "cso_cache/cso_hash.h"
+
+/* This function will either find the state of the given template
+ * in the cache or it will create a new state state from the given
+ * template, will insert it in the cache and return it.
+ */
+struct pipe_blend_state * st_cached_blend_state(
+   struct st_context *st,
+   const struct pipe_blend_state *blend)
+{
+   unsigned hash_key = cso_construct_key((void*)blend, sizeof(struct pipe_blend_state));
+   struct cso_hash_iter iter = cso_find_state_template(st->cache,
+                                                       hash_key, CSO_BLEND,
+                                                       (void*)blend);
+   if (cso_hash_iter_is_null(iter)) {
+      const struct pipe_blend_state *created_state = st->pipe->create_blend_state(
+         st->pipe, blend);
+      iter = cso_insert_state(st->cache, hash_key, CSO_BLEND,
+                              (void*)created_state);
+   }
+   return (struct pipe_blend_state*)(cso_hash_iter_data(iter));
+}
diff --git a/src/mesa/state_tracker/st_cache.h b/src/mesa/state_tracker/st_cache.h
new file mode 100644
index 0000000000..29b1d00dca
--- /dev/null
+++ b/src/mesa/state_tracker/st_cache.h
@@ -0,0 +1,43 @@
+/**************************************************************************
+ *
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * 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
+ * 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.
+ *
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Zack Rusin <zack@tungstengraphics.com>
+  */
+
+#ifndef ST_CACHE_H
+#define ST_CACHE_H
+
+struct pipe_blend_state;
+struct st_context;
+
+struct pipe_blend_state * st_cached_blend_state(
+   struct st_context *st,
+   const struct pipe_blend_state *blend);
+
+#endif
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index dc8a84af08..55e03f644e 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -35,6 +35,7 @@
 #include "main/macros.h"
 #include "shader/prog_instruction.h"
 #include "st_atom.h"
+#include "st_cache.h"
 #include "st_context.h"
 #include "st_cb_clear.h"
 #include "st_cb_fbo.h"
@@ -49,8 +50,6 @@
 
 #include "pipe/tgsi/mesa/mesa_to_tgsi.h"
 
-#include "cso_cache/cso_cache.h"
-
 #include "vf/vf.h"
 
 
@@ -297,7 +296,7 @@ clear_with_quad(GLcontext *ctx,
          if (st->ctx->Color.DitherFlag)
             blend.dither = 1;
       }
-      const struct pipe_blend_state *state = cso_cached_blend_state(st, &blend);
+      const struct pipe_blend_state *state = st_cached_blend_state(st, &blend);
       pipe->bind_blend_state(pipe, state);
    }
 
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 26815d5cd4..f9717465f4 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -115,7 +115,7 @@ void st_destroy_context( struct st_context *st )
    /*st_destroy_cb_teximage( st );*/
    st_destroy_cb_texture( st );
 #endif
-   cso_cache_destroy( st->cache );
+   cso_cache_delete( st->cache );
 
    st->pipe->destroy( st->pipe );
    FREE( st );