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

virgl: Use alpha_src_factor to store blend_equation_advenced value 

Signed-off-by: Elie Tournier <elie.tournier@collabora.com>
Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5516>
This commit is contained in:
Elie Tournier 2020-06-24 21:43:40 +01:00 committed by Marge Bot
parent 0ee1a67f3c
commit a026364b55
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/virgl/virgl_encode.c
View File

@ -338,13 +338,19 @@ int virgl_encode_blend_state(struct virgl_context *ctx,
virgl_encoder_write_dword(ctx->cbuf, tmp);
for (i = 0; i < VIRGL_MAX_COLOR_BUFS; i++) {
/* We use alpha src factor to pass the advanced blend equation value
* to the host. By doing so, we don't have to change the protocol.
*/
uint32_t alpha = (i == 0 && blend_state->advanced_blend_func)
? blend_state->advanced_blend_func
: blend_state->rt[i].alpha_src_factor;
tmp =
VIRGL_OBJ_BLEND_S2_RT_BLEND_ENABLE(blend_state->rt[i].blend_enable) |
VIRGL_OBJ_BLEND_S2_RT_RGB_FUNC(blend_state->rt[i].rgb_func) |
VIRGL_OBJ_BLEND_S2_RT_RGB_SRC_FACTOR(blend_state->rt[i].rgb_src_factor) |
VIRGL_OBJ_BLEND_S2_RT_RGB_DST_FACTOR(blend_state->rt[i].rgb_dst_factor)|
VIRGL_OBJ_BLEND_S2_RT_ALPHA_FUNC(blend_state->rt[i].alpha_func) |
VIRGL_OBJ_BLEND_S2_RT_ALPHA_SRC_FACTOR(blend_state->rt[i].alpha_src_factor) |
VIRGL_OBJ_BLEND_S2_RT_ALPHA_SRC_FACTOR(alpha) |
VIRGL_OBJ_BLEND_S2_RT_ALPHA_DST_FACTOR(blend_state->rt[i].alpha_dst_factor) |
VIRGL_OBJ_BLEND_S2_RT_COLORMASK(blend_state->rt[i].colormask);
virgl_encoder_write_dword(ctx->cbuf, tmp);

1
src/gallium/include/pipe/p_state.h
View File

@ -365,6 +365,7 @@ struct pipe_blend_state
unsigned alpha_to_coverage_dither:1;
unsigned alpha_to_one:1;
unsigned max_rt:3; /* index of max rt, Ie. # of cbufs minus 1 */
unsigned advanced_blend_func:4;
struct pipe_rt_blend_state rt[PIPE_MAX_COLOR_BUFS];
};

4
src/mesa/state_tracker/st_atom_blend.c
View File

@ -217,6 +217,10 @@ st_update_blend( struct st_context *st )
blend->logicop_enable = 1;
blend->logicop_func = ctx->Color._LogicOp;
}
else if (ctx->Color.BlendEnabled &&
ctx->Color._AdvancedBlendMode != BLEND_NONE) {
blend->advanced_blend_func = ctx->Color._AdvancedBlendMode;
}
else if (ctx->Color.BlendEnabled &&
ctx->Color._AdvancedBlendMode == BLEND_NONE) {
/* blending enabled */