Mesa (master): panfrost: Don't accidentally include blend shader

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: fbbb29aa5b5ee62b53c1af290c5dec58ccc7b40c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fbbb29aa5b5ee62b53c1af290c5dec58ccc7b40c

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Mon Jun 17 10:08:47 2019 -0700

panfrost: Don't accidentally include blend shader

Some residual dirty state can leak through across frames; zero this out.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>

---

 src/gallium/drivers/panfrost/pan_context.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index f7033006494..7f5741da48e 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -1141,6 +1141,8 @@ panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data)
 
                 if (ctx->blend->has_blend_shader) {
                         ctx->fragment_shader_core.blend.shader = ctx->blend->blend_shader;
+                } else {
+                        ctx->fragment_shader_core.blend.shader = 0;
                 }
 
                 if (ctx->require_sfbd) {