From 0a60ebe30c186daf1fbe569e07bfe2e75f765824 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 7 Dec 2014 14:21:41 +0100 Subject: cso: put cso_release_all into cso_destroy_context Reviewed-by: Brian Paul --- src/gallium/state_trackers/nine/device9.c | 1 - src/gallium/state_trackers/vega/vg_context.c | 1 - src/gallium/state_trackers/xa/xa_context.c | 1 - 3 files changed, 3 deletions(-) (limited to 'src/gallium/state_trackers') diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index e9599b853c0..b0e42ebc8ab 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -360,7 +360,6 @@ NineDevice9_dtor( struct NineDevice9 *This ) /* state stuff */ if (This->pipe) { if (This->cso) { - cso_release_all(This->cso); cso_destroy_context(This->cso); } if (This->pipe->destroy) { This->pipe->destroy(This->pipe); } diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c index 46c7d9649fd..48a03c5a64a 100644 --- a/src/gallium/state_trackers/vega/vg_context.c +++ b/src/gallium/state_trackers/vega/vg_context.c @@ -161,7 +161,6 @@ void vg_destroy_context(struct vg_context *ctx) if (ctx->mask.set_fs) vg_shader_destroy(ctx, ctx->mask.set_fs); - cso_release_all(ctx->cso_context); cso_destroy_context(ctx->cso_context); cso_hash_delete(ctx->owned_objects[VG_OBJECT_PAINT]); diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/state_trackers/xa/xa_context.c index df3043c8929..fd49c82a559 100644 --- a/src/gallium/state_trackers/xa/xa_context.c +++ b/src/gallium/state_trackers/xa/xa_context.c @@ -82,7 +82,6 @@ xa_context_destroy(struct xa_context *r) pipe_surface_reference(&r->srf, NULL); if (r->cso) { - cso_release_all(r->cso); cso_destroy_context(r->cso); r->cso = NULL; } -- cgit v1.2.3