summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2017-08-26 16:59:42 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2017-08-26 16:59:42 +0000
commit81ece42815e80818f160cdd85fab57d65b56ad15 (patch)
tree1059ff094da1aa50334115952fcb1cfcbda3acc6 /lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c
parentb0244145d5bb49623d58f6b5cab8143ada692b60 (diff)
Revert to Mesa 13.0.6 to hopefully address rendering issues a handful of
people have reported with xpdf/fvwm on ivy bridge with modesetting driver.
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c')
-rw-r--r--lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c b/lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c
index d36f1fbd7..1f3be4b28 100644
--- a/lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c
+++ b/lib/mesa/src/gallium/auxiliary/cso_cache/cso_cache.c
@@ -188,7 +188,9 @@ cso_insert_state(struct cso_cache *sc,
void *state)
{
struct cso_hash *hash = _cso_hash_for_type(sc, type);
- sanitize_hash(sc, hash, type, sc->max_size);
+
+ if (type != CSO_SAMPLER)
+ sanitize_hash(sc, hash, type, sc->max_size);
return cso_hash_insert(hash, hash_key, state);
}
@@ -247,7 +249,7 @@ struct cso_cache *cso_cache_create(void)
{
struct cso_cache *sc = MALLOC_STRUCT(cso_cache);
int i;
- if (sc == NULL)
+ if (!sc)
return NULL;
sc->max_size = 4096;