AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Remove reference to mali_blend_equation_packed

Browse Source 
Genxml dependent.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11785>
This commit is contained in:
Alyssa Rosenzweig
2021-07-08 14:54:01 -04:00
committed by Marge Bot
parent d0b036ff71
commit 7308536f41
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/panfrost/pan_blend_cso.h
View File

@@ -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;

6
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@@ -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 */