From: Alyssa Rosenzweig Date: Thu, 8 Jul 2021 18:54:01 +0000 (-0400) Subject: panfrost: Remove reference to mali_blend_equation_packed X-Git-Tag: upstream/21.2.3~507 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7308536f41d69c95ea998578c7a37f7afa10df59;p=platform%2Fupstream%2Fmesa.git panfrost: Remove reference to mali_blend_equation_packed Genxml dependent. Signed-off-by: Alyssa Rosenzweig Part-of: --- diff --git a/src/gallium/drivers/panfrost/pan_blend_cso.h b/src/gallium/drivers/panfrost/pan_blend_cso.h index ee2c7a3..6edcd93 100644 --- a/src/gallium/drivers/panfrost/pan_blend_cso.h +++ b/src/gallium/drivers/panfrost/pan_blend_cso.h @@ -46,7 +46,7 @@ struct panfrost_blend_state { struct pipe_blend_state base; struct pan_blend_state pan; struct pan_blend_info info[PIPE_MAX_COLOR_BUFS]; - struct mali_blend_equation_packed equation[PIPE_MAX_COLOR_BUFS]; + uint32_t equation[PIPE_MAX_COLOR_BUFS]; /* info.load presented as a bitfield for draw call hot paths */ unsigned load_dest_mask : PIPE_MAX_COLOR_BUFS; diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index aaaac54..215dc70 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -362,7 +362,7 @@ panfrost_emit_bifrost_blend(struct panfrost_batch *batch, if (!blend_shaders[i]) { /* Word 1: Blend Equation */ STATIC_ASSERT(MALI_BLEND_EQUATION_LENGTH == 4); - packed->opaque[1] = so->equation[i].opaque[0]; + packed->opaque[1] = so->equation[i]; } /* Words 2 and 3: Internal blend */ @@ -445,7 +445,7 @@ panfrost_emit_midgard_blend(struct panfrost_batch *batch, if (!blend_shaders[i]) { /* Word 2: Blend Equation */ STATIC_ASSERT(MALI_BLEND_EQUATION_LENGTH == 4); - packed->opaque[2] = so->equation[i].opaque[0]; + packed->opaque[2] = so->equation[i]; } } } @@ -640,7 +640,7 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx, /* Word 14: SFBD Blend Equation */ STATIC_ASSERT(MALI_BLEND_EQUATION_LENGTH == 4); - rsd.opaque[14] = ctx->blend->equation[0].opaque[0]; + rsd.opaque[14] = ctx->blend->equation[0]; } /* Merge with CSO state and upload */