diff options
author | Michel Dänzer <[email protected]> | 2008-05-08 19:01:34 +0100 |
---|---|---|
committer | Michel Dänzer <[email protected]> | 2008-05-08 19:01:34 +0100 |
commit | d2ec02f44026244130b4e6f9d87eac6a03a9c6c1 (patch) | |
tree | 24668c5f9df30dc08f87f99e337538846c1b4a93 /src | |
parent | 8eab7de888bb4056c34f80edfbc90a543736ea3b (diff) | |
parent | 1dfb3d4729ce4cd71a593c14dbb2907cd987f8ab (diff) |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index 5d626b7cdc7..dc5987df448 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -84,7 +84,7 @@ static boolean delete_blend_state(struct cso_context *ctx, void *state) { struct cso_blend *cso = (struct cso_blend *)state; - if (ctx->blend == state) + if (ctx->blend == cso->data) return FALSE; if (cso->delete_state) |