Module: Mesa Branch: main Commit: eb1112ae7a6e1724c26059072aee916ea7304c25 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eb1112ae7a6e1724c26059072aee916ea7304c25
Author: Alyssa Rosenzweig <[email protected]> Date: Mon Jul 10 18:14:03 2023 -0400 lvp: Use common blend/logicop translation Signed-off-by: Alyssa Rosenzweig <[email protected]> Reviewed-by: Italo Nicola <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24076> --- src/gallium/frontends/lavapipe/lvp_conv.h | 107 --------------------------- src/gallium/frontends/lavapipe/lvp_execute.c | 29 ++++---- 2 files changed, 15 insertions(+), 121 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_conv.h b/src/gallium/frontends/lavapipe/lvp_conv.h index 47d2a18a78b..2dd3cd20d24 100644 --- a/src/gallium/frontends/lavapipe/lvp_conv.h +++ b/src/gallium/frontends/lavapipe/lvp_conv.h @@ -110,113 +110,6 @@ static inline unsigned vk_conv_wrap_mode(enum VkSamplerAddressMode addr_mode) } } -static inline unsigned vk_conv_blend_factor(enum VkBlendFactor vk_factor) -{ - switch (vk_factor) { - case VK_BLEND_FACTOR_ZERO: - return PIPE_BLENDFACTOR_ZERO; - case VK_BLEND_FACTOR_ONE: - return PIPE_BLENDFACTOR_ONE; - case VK_BLEND_FACTOR_SRC_COLOR: - return PIPE_BLENDFACTOR_SRC_COLOR; - case VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR: - return PIPE_BLENDFACTOR_INV_SRC_COLOR; - case VK_BLEND_FACTOR_DST_COLOR: - return PIPE_BLENDFACTOR_DST_COLOR; - case VK_BLEND_FACTOR_ONE_MINUS_DST_COLOR: - return PIPE_BLENDFACTOR_INV_DST_COLOR; - case VK_BLEND_FACTOR_SRC_ALPHA: - return PIPE_BLENDFACTOR_SRC_ALPHA; - case VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: - return PIPE_BLENDFACTOR_INV_SRC_ALPHA; - case VK_BLEND_FACTOR_DST_ALPHA: - return PIPE_BLENDFACTOR_DST_ALPHA; - case VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA: - return PIPE_BLENDFACTOR_INV_DST_ALPHA; - case VK_BLEND_FACTOR_CONSTANT_COLOR: - return PIPE_BLENDFACTOR_CONST_COLOR; - case VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR: - return PIPE_BLENDFACTOR_INV_CONST_COLOR; - case VK_BLEND_FACTOR_CONSTANT_ALPHA: - return PIPE_BLENDFACTOR_CONST_ALPHA; - case VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA: - return PIPE_BLENDFACTOR_INV_CONST_ALPHA; - case VK_BLEND_FACTOR_SRC1_COLOR: - return PIPE_BLENDFACTOR_SRC1_COLOR; - case VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR: - return PIPE_BLENDFACTOR_INV_SRC1_COLOR; - case VK_BLEND_FACTOR_SRC1_ALPHA: - return PIPE_BLENDFACTOR_SRC1_ALPHA; - case VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA: - return PIPE_BLENDFACTOR_INV_SRC1_ALPHA; - case VK_BLEND_FACTOR_SRC_ALPHA_SATURATE: - return PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE; - default: - assert(0); - return 0; - } -} - -static inline unsigned vk_conv_blend_func(enum VkBlendOp op) -{ - switch (op) { - case VK_BLEND_OP_ADD: - return PIPE_BLEND_ADD; - case VK_BLEND_OP_SUBTRACT: - return PIPE_BLEND_SUBTRACT; - case VK_BLEND_OP_REVERSE_SUBTRACT: - return PIPE_BLEND_REVERSE_SUBTRACT; - case VK_BLEND_OP_MIN: - return PIPE_BLEND_MIN; - case VK_BLEND_OP_MAX: - return PIPE_BLEND_MAX; - default: - assert(0); - return 0; - } -} - -static inline unsigned vk_conv_logic_op(enum VkLogicOp op) -{ - switch (op) { - case VK_LOGIC_OP_CLEAR: - return PIPE_LOGICOP_CLEAR; - case VK_LOGIC_OP_NOR: - return PIPE_LOGICOP_NOR; - case VK_LOGIC_OP_AND_INVERTED: - return PIPE_LOGICOP_AND_INVERTED; - case VK_LOGIC_OP_COPY_INVERTED: - return PIPE_LOGICOP_COPY_INVERTED; - case VK_LOGIC_OP_AND_REVERSE: - return PIPE_LOGICOP_AND_REVERSE; - case VK_LOGIC_OP_INVERT: - return PIPE_LOGICOP_INVERT; - case VK_LOGIC_OP_XOR: - return PIPE_LOGICOP_XOR; - case VK_LOGIC_OP_NAND: - return PIPE_LOGICOP_NAND; - case VK_LOGIC_OP_AND: - return PIPE_LOGICOP_AND; - case VK_LOGIC_OP_EQUIVALENT: - return PIPE_LOGICOP_EQUIV; - case VK_LOGIC_OP_NO_OP: - return PIPE_LOGICOP_NOOP; - case VK_LOGIC_OP_OR_INVERTED: - return PIPE_LOGICOP_OR_INVERTED; - case VK_LOGIC_OP_COPY: - return PIPE_LOGICOP_COPY; - case VK_LOGIC_OP_OR_REVERSE: - return PIPE_LOGICOP_OR_REVERSE; - case VK_LOGIC_OP_OR: - return PIPE_LOGICOP_OR; - case VK_LOGIC_OP_SET: - return PIPE_LOGICOP_SET; - default: - assert(0); - return 0; - } -} - static inline enum pipe_swizzle vk_conv_swizzle(VkComponentSwizzle swiz) { switch (swiz) { diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 6b33373d433..3139b11b176 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -46,6 +46,7 @@ #include "tgsi/tgsi_from_mesa.h" #include "vulkan/util/vk_util.h" +#include "vk_blend.h" #include "vk_cmd_enqueue_entrypoints.h" #include "vk_util.h" @@ -855,7 +856,7 @@ static void handle_graphics_pipeline(struct lvp_pipeline *pipeline, if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_LOGIC_OP_ENABLE)) state->blend_state.logicop_enable = ps->cb->logic_op_enable; if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_LOGIC_OP)) - state->blend_state.logicop_func = vk_conv_logic_op(ps->cb->logic_op); + state->blend_state.logicop_func = vk_logic_op_to_pipe(ps->cb->logic_op); if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES)) state->color_write_disables = ~ps->cb->color_write_enables; @@ -875,12 +876,12 @@ static void handle_graphics_pipeline(struct lvp_pipeline *pipeline, state->blend_state.rt[i].alpha_src_factor = 0; state->blend_state.rt[i].alpha_dst_factor = 0; } else if (!BITSET_TEST(ps->dynamic, MESA_VK_DYNAMIC_CB_BLEND_EQUATIONS)) { - state->blend_state.rt[i].rgb_func = vk_conv_blend_func(att->color_blend_op); - state->blend_state.rt[i].rgb_src_factor = vk_conv_blend_factor(att->src_color_blend_factor); - state->blend_state.rt[i].rgb_dst_factor = vk_conv_blend_factor(att->dst_color_blend_factor); - state->blend_state.rt[i].alpha_func = vk_conv_blend_func(att->alpha_blend_op); - state->blend_state.rt[i].alpha_src_factor = vk_conv_blend_factor(att->src_alpha_blend_factor); - state->blend_state.rt[i].alpha_dst_factor = vk_conv_blend_factor(att->dst_alpha_blend_factor); + state->blend_state.rt[i].rgb_func = vk_blend_op_to_pipe(att->color_blend_op); + state->blend_state.rt[i].rgb_src_factor = vk_blend_factor_to_pipe(att->src_color_blend_factor); + state->blend_state.rt[i].rgb_dst_factor = vk_blend_factor_to_pipe(att->dst_color_blend_factor); + state->blend_state.rt[i].alpha_func = vk_blend_op_to_pipe(att->alpha_blend_op); + state->blend_state.rt[i].alpha_src_factor = vk_blend_factor_to_pipe(att->src_alpha_blend_factor); + state->blend_state.rt[i].alpha_dst_factor = vk_blend_factor_to_pipe(att->dst_alpha_blend_factor); } /* At least llvmpipe applies the blend factor prior to the blend function, @@ -3367,7 +3368,7 @@ static void handle_set_depth_bias_enable(struct vk_cmd_queue_entry *cmd, static void handle_set_logic_op(struct vk_cmd_queue_entry *cmd, struct rendering_state *state) { - unsigned op = vk_conv_logic_op(cmd->u.set_logic_op_ext.logic_op); + unsigned op = vk_logic_op_to_pipe(cmd->u.set_logic_op_ext.logic_op); state->rs_dirty |= state->blend_state.logicop_func != op; state->blend_state.logicop_func = op; } @@ -3555,12 +3556,12 @@ static void handle_set_color_blend_equation(struct vk_cmd_queue_entry *cmd, const VkColorBlendEquationEXT *cb = cmd->u.set_color_blend_equation_ext.color_blend_equations; state->blend_dirty = true; for (unsigned i = 0; i < cmd->u.set_color_blend_equation_ext.attachment_count; i++) { - state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].rgb_func = vk_conv_blend_func(cb[i].colorBlendOp); - state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].rgb_src_factor = vk_conv_blend_factor(cb[i].srcColorBlendFactor); - state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].rgb_dst_factor = vk_conv_blend_factor(cb[i].dstColorBlendFactor); - state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].alpha_func = vk_conv_blend_func(cb[i].alphaBlendOp); - state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].alpha_src_factor = vk_conv_blend_factor(cb[i].srcAlphaBlendFactor); - state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].alpha_dst_factor = vk_conv_blend_factor(cb[i].dstAlphaBlendFactor); + state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].rgb_func = vk_blend_op_to_pipe(cb[i].colorBlendOp); + state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].rgb_src_factor = vk_blend_factor_to_pipe(cb[i].srcColorBlendFactor); + state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].rgb_dst_factor = vk_blend_factor_to_pipe(cb[i].dstColorBlendFactor); + state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].alpha_func = vk_blend_op_to_pipe(cb[i].alphaBlendOp); + state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].alpha_src_factor = vk_blend_factor_to_pipe(cb[i].srcAlphaBlendFactor); + state->blend_state.rt[cmd->u.set_color_blend_equation_ext.first_attachment + i].alpha_dst_factor = vk_blend_factor_to_pipe(cb[i].dstAlphaBlendFactor); /* At least llvmpipe applies the blend factor prior to the blend function, * regardless of what function is used. (like i965 hardware).
