Attachment 108144 Details for Bug 85267 – r600g: Drop references to destroyed blend state

[patch] r600g: Drop references to destroyed blend state

r600g-blend-state-destroy.diff (text/plain), 1.33 KB, created by Michel Dänzer on 2014-10-21 03:42:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2014-10-21 03:42:48 UTC

Size: 1.33 KB

patch

obsolete

>commit ccc79efd60e1d99238e844dc1f2e872ef2e4efac
>Author: Michel DÃ¤nzer <michel.daenzer@amd.com>
>Date:   Tue Oct 21 12:40:15 2014 +0900
>
>    r600g: Drop references to destroyed blend state
>
>diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
>index 68365f9..879ec35 100644
>--- a/src/gallium/drivers/r600/r600_state_common.c
>+++ b/src/gallium/drivers/r600/r600_state_common.c
>@@ -158,8 +158,10 @@ static void r600_bind_blend_state(struct pipe_context *ctx, void *state)
> 	struct r600_context *rctx = (struct r600_context *)ctx;
> 	struct r600_blend_state *blend = (struct r600_blend_state *)state;
> 
>-	if (blend == NULL)
>+	if (blend == NULL) {
>+		r600_set_cso_state_with_cb(&rctx->blend_state, NULL, NULL);
> 		return;
>+	}
> 
> 	r600_bind_blend_state_internal(rctx, blend, rctx->force_blend_disable);
> }
>@@ -447,8 +449,13 @@ static void r600_delete_sampler_state(struct pipe_context *ctx, void *state)
> 
> static void r600_delete_blend_state(struct pipe_context *ctx, void *state)
> {
>+	struct r600_context *rctx = (struct r600_context *)ctx;
> 	struct r600_blend_state *blend = (struct r600_blend_state*)state;
> 
>+	if (rctx->blend_state.cso == state) {
>+		ctx->bind_blend_state(ctx, NULL);
>+	}
>+
> 	r600_release_command_buffer(&blend->buffer);
> 	r600_release_command_buffer(&blend->buffer_no_blend);
> 	FREE(blend);

Actions: View | Splinter Review

Attachments on bug 85267: 108144 | 108163

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.