summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-03-09 20:21:45 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2008-03-09 20:23:05 +0000
commitb041dbe9019ff8cb16ff15d0baaa803c7dc654db (patch)
treef2c5ff9e3efa5f6dba9f2ae4ab346613c5ecbfe3 /src/gallium
parentaff4cf19a753baf0428d2bf53614900e5afea8a3 (diff)
gallium: avoid deleting currently-bound CSO's on cache destruction
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_context.c34
1 files changed, 24 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 596e5a9ad6..fbb26ca511 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -72,6 +72,9 @@ struct cso_context *cso_create_context( struct pipe_context *pipe )
ctx->pipe = pipe;
+ /* Enable for testing: */
+ if (0) cso_set_maximum_cache_size( ctx->cache, 4 );
+
return ctx;
out:
@@ -79,20 +82,31 @@ out:
return NULL;
}
+static void cso_release_all( struct cso_context *ctx )
+{
+ if (ctx->pipe) {
+ ctx->pipe->bind_blend_state( ctx->pipe, NULL );
+ ctx->pipe->bind_rasterizer_state( ctx->pipe, NULL );
+ ctx->pipe->bind_sampler_states( ctx->pipe, 0, NULL );
+ ctx->pipe->bind_depth_stencil_alpha_state( ctx->pipe, NULL );
+ ctx->pipe->bind_fs_state( ctx->pipe, NULL );
+ ctx->pipe->bind_vs_state( ctx->pipe, NULL );
+ }
+
+ if (ctx->cache) {
+ cso_cache_delete( ctx->cache );
+ ctx->cache = NULL;
+ }
+}
+
void cso_destroy_context( struct cso_context *ctx )
{
- if (ctx == NULL)
- return;
-
-/*
- if (ctx->pipe)
- ctx->pipe->flush( ctx->pipe, PIPE_FLUSH_UNBIND_ALL );
-*/
+ debug_printf("%s\n", __FUNCTION__);
+
+ if (ctx)
+ cso_release_all( ctx );
- if (ctx->cache)
- cso_cache_delete( ctx->cache );
-
FREE( ctx );
}