OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Fix pan_blend_to_fixed_function_equation prototype

Browse Source 
Doesn't need the whole state, just the equation itself.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Fixes: 93824b6451 ("panfrost: Move the blend logic out of the gallium driver")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10869>
This commit is contained in:
Alyssa Rosenzweig
2021-05-14 10:36:27 -04:00
committed by Marge Bot
parent b2affb6cc5
commit d7590efd25
3 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/panfrost/pan_blend_cso.c
View File

@@ -161,8 +161,7 @@ panfrost_get_blend_for_context(struct panfrost_context *ctx, unsigned rti, struc
.no_colour = pan_blend.rts[rti].equation.color_mask == 0,
};
pan_blend_to_fixed_function_equation(dev, &pan_blend, rti,
&final.equation.equation);
pan_blend_to_fixed_function_equation(eq, &final.equation.equation);
return final;
}

59
src/panfrost/lib/pan_blend.c
View File

@@ -271,47 +271,40 @@ pan_blend_reads_dest(const struct pan_blend_equation equation)
equation.alpha_invert_dst_factor;
}
/* Create the descriptor for a fixed blend mode given the corresponding Gallium
* state, if possible. Return true and write out the blend descriptor into
* blend_equation. If it is not possible with the fixed function
* representation, return false to handle degenerate cases with a blend shader
*/
/* Create the descriptor for a fixed blend mode given the corresponding API
* state. Assumes the equation can be represented as fixed-function. */
void
pan_blend_to_fixed_function_equation(ASSERTED const struct panfrost_device *dev,
const struct pan_blend_state *state,
unsigned rt,
struct MALI_BLEND_EQUATION *equation)
pan_blend_to_fixed_function_equation(const struct pan_blend_equation equation,
struct MALI_BLEND_EQUATION *out)
{
const struct pan_blend_rt_state *rt_state = &state->rts[rt];
/* If no blending is enabled, default back on `replace` mode */
if (!rt_state->equation.blend_enable) {
equation->color_mask = rt_state->equation.color_mask;
equation->rgb.a = MALI_BLEND_OPERAND_A_SRC;
equation->rgb.b = MALI_BLEND_OPERAND_B_SRC;
equation->rgb.c = MALI_BLEND_OPERAND_C_ZERO;
equation->alpha.a = MALI_BLEND_OPERAND_A_SRC;
equation->alpha.b = MALI_BLEND_OPERAND_B_SRC;
equation->alpha.c = MALI_BLEND_OPERAND_C_ZERO;
if (!equation.blend_enable) {
out->color_mask = equation.color_mask;
out->rgb.a = MALI_BLEND_OPERAND_A_SRC;
out->rgb.b = MALI_BLEND_OPERAND_B_SRC;
out->rgb.c = MALI_BLEND_OPERAND_C_ZERO;
out->alpha.a = MALI_BLEND_OPERAND_A_SRC;
out->alpha.b = MALI_BLEND_OPERAND_B_SRC;
out->alpha.c = MALI_BLEND_OPERAND_C_ZERO;
return;
}
/* Try to compile the actual fixed-function blend */
to_panfrost_function(rt_state->equation.rgb_func,
rt_state->equation.rgb_src_factor,
rt_state->equation.rgb_invert_src_factor,
rt_state->equation.rgb_dst_factor,
rt_state->equation.rgb_invert_dst_factor,
&equation->rgb);
/* Compile the fixed-function blend */
to_panfrost_function(equation.rgb_func,
equation.rgb_src_factor,
equation.rgb_invert_src_factor,
equation.rgb_dst_factor,
equation.rgb_invert_dst_factor,
&out->rgb);
to_panfrost_function(rt_state->equation.alpha_func,
rt_state->equation.alpha_src_factor,
rt_state->equation.alpha_invert_src_factor,
rt_state->equation.alpha_dst_factor,
rt_state->equation.alpha_invert_dst_factor,
&equation->alpha);
equation->color_mask = rt_state->equation.color_mask;
to_panfrost_function(equation.alpha_func,
equation.alpha_src_factor,
equation.alpha_invert_src_factor,
equation.alpha_dst_factor,
equation.alpha_invert_dst_factor,
&out->alpha);
out->color_mask = equation.color_mask;
}
static const char *

4
src/panfrost/lib/pan_blend.h
View File

@@ -132,9 +132,7 @@ bool
pan_blend_is_homogenous_constant(unsigned mask, float *constants);
void
pan_blend_to_fixed_function_equation(const struct panfrost_device *dev,
const struct pan_blend_state *state,
unsigned rt,
pan_blend_to_fixed_function_equation(const struct pan_blend_equation eq,
struct MALI_BLEND_EQUATION *equation);
nir_shader *