Mesa (master): cso: Store hash key in struct cso_sampler

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: 745e2eaaec1f938184f3e9a2acfacf7e02ce0da8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=745e2eaaec1f938184f3e9a2acfacf7e02ce0da8

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Dec 16 11:41:54 2016 +0900

cso: Store hash key in struct cso_sampler

Preparation for following changes, no functional change intended.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/auxiliary/cso_cache/cso_cache.h   | 1 +
 src/gallium/auxiliary/cso_cache/cso_context.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.h b/src/gallium/auxiliary/cso_cache/cso_cache.h
index 052245f..ab1e4af 100644
--- a/src/gallium/auxiliary/cso_cache/cso_cache.h
+++ b/src/gallium/auxiliary/cso_cache/cso_cache.h
@@ -129,6 +129,7 @@ struct cso_sampler {
    void *data;
    cso_state_callback delete_state;
    struct pipe_context *context;
+   unsigned hash_key;
 };
 
 struct cso_velems_state {
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 0f4a333..6031cfc 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -1182,6 +1182,7 @@ cso_single_sampler(struct cso_context *ctx, unsigned shader_stage,
          cso->delete_state =
             (cso_state_callback) ctx->pipe->delete_sampler_state;
          cso->context = ctx->pipe;
+         cso->hash_key = hash_key;
 
          iter = cso_insert_state(ctx->cache, hash_key, CSO_SAMPLER, cso);
          if (cso_hash_iter_is_null(iter)) {