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

lavapipe: improve blend handling on pipeline binds

Browse Source 
* use renderpass info for independent blend
* only reset blend state if no color attachments

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18913>
This commit is contained in:
Mike Blumenkrantz
2022-09-30 14:06:40 -04:00
committed by Marge Bot
parent 7e54fea373
commit 57f966ed1e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@@ -850,6 +850,8 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
state->dsa_dirty = true; state->dsa_dirty = true;
} }
state->blend_state.independent_blend_enable = ps->rp->color_attachment_count > 1;
if (ps->cb) { if (ps->cb) {
if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_LOGIC_OP_ENABLE)) if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_LOGIC_OP_ENABLE))
state->blend_state.logicop_enable = ps->cb->logic_op_enable; state->blend_state.logicop_enable = ps->cb->logic_op_enable;
@@ -859,8 +861,6 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES)) if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES))
state->color_write_disables = ~ps->cb->color_write_enables; state->color_write_disables = ~ps->cb->color_write_enables;
state->blend_state.independent_blend_enable = (ps->cb->attachment_count > 1);
for (unsigned i = 0; i < ps->cb->attachment_count; i++) { for (unsigned i = 0; i < ps->cb->attachment_count; i++) {
const struct vk_color_blend_attachment_state *att = &ps->cb->attachments[i]; const struct vk_color_blend_attachment_state *att = &ps->cb->attachments[i];
if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_WRITE_MASKS)) if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_WRITE_MASKS))
@@ -905,7 +905,7 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
memcpy(state->blend_color.color, ps->cb->blend_constants, 4 * sizeof(float)); memcpy(state->blend_color.color, ps->cb->blend_constants, 4 * sizeof(float));
state->blend_color_dirty = true; state->blend_color_dirty = true;
} }
} else { } else if (ps->rp->color_attachment_count == 0) {
memset(&state->blend_state, 0, sizeof(state->blend_state)); memset(&state->blend_state, 0, sizeof(state->blend_state));
state->blend_dirty = true; state->blend_dirty = true;
} }