vulkan: Add helpers for blend enum translation
Vulkan drivers that use nir_lower_blend need to translate Vulkan enums to the common (non-Vulkan) versions used in nir_lower_blend. We don't need to duplicate that boilerplate in every VK driver that uses nir_lower_blend, move panvk's versions to common code so we can use them in agxv. I suspect powervr wants this too. It might be useful to also share the logic to translate vk_color_blend_state to nir_lower_blend_options wholesale, but panvk wouldn't use it and agxv is downstream so it wouldn't have any in-tree users. So I'll keep that part vendored (for now). For now, let's share the easy win of the enum translation. Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Reviewed-by: Italo Nicola <italonicola@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24076>
This commit is contained in:

committed by
Marge Bot

parent
521d596d27
commit
31001c6184
@@ -28,6 +28,8 @@ vulkan_runtime_files = files(
|
||||
'rmv/vk_rmv_tokens.h',
|
||||
'vk_acceleration_structure.c',
|
||||
'vk_acceleration_structure.h',
|
||||
'vk_blend.c',
|
||||
'vk_blend.h',
|
||||
'vk_buffer.c',
|
||||
'vk_buffer.h',
|
||||
'vk_cmd_copy.c',
|
||||
|
115
src/vulkan/runtime/vk_blend.c
Normal file
115
src/vulkan/runtime/vk_blend.c
Normal file
@@ -0,0 +1,115 @@
|
||||
/*
|
||||
* Copyright 2023 Valve Corporation
|
||||
* Copyright 2021 Collabora Ltd.
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
#include "vk_blend.h"
|
||||
#include "util/macros.h"
|
||||
|
||||
enum pipe_logicop
|
||||
vk_logic_op_to_pipe(VkLogicOp in)
|
||||
{
|
||||
switch (in) {
|
||||
case VK_LOGIC_OP_CLEAR:
|
||||
return PIPE_LOGICOP_CLEAR;
|
||||
case VK_LOGIC_OP_AND:
|
||||
return PIPE_LOGICOP_AND;
|
||||
case VK_LOGIC_OP_AND_REVERSE:
|
||||
return PIPE_LOGICOP_AND_REVERSE;
|
||||
case VK_LOGIC_OP_COPY:
|
||||
return PIPE_LOGICOP_COPY;
|
||||
case VK_LOGIC_OP_AND_INVERTED:
|
||||
return PIPE_LOGICOP_AND_INVERTED;
|
||||
case VK_LOGIC_OP_NO_OP:
|
||||
return PIPE_LOGICOP_NOOP;
|
||||
case VK_LOGIC_OP_XOR:
|
||||
return PIPE_LOGICOP_XOR;
|
||||
case VK_LOGIC_OP_OR:
|
||||
return PIPE_LOGICOP_OR;
|
||||
case VK_LOGIC_OP_NOR:
|
||||
return PIPE_LOGICOP_NOR;
|
||||
case VK_LOGIC_OP_EQUIVALENT:
|
||||
return PIPE_LOGICOP_EQUIV;
|
||||
case VK_LOGIC_OP_INVERT:
|
||||
return PIPE_LOGICOP_INVERT;
|
||||
case VK_LOGIC_OP_OR_REVERSE:
|
||||
return PIPE_LOGICOP_OR_REVERSE;
|
||||
case VK_LOGIC_OP_COPY_INVERTED:
|
||||
return PIPE_LOGICOP_COPY_INVERTED;
|
||||
case VK_LOGIC_OP_OR_INVERTED:
|
||||
return PIPE_LOGICOP_OR_INVERTED;
|
||||
case VK_LOGIC_OP_NAND:
|
||||
return PIPE_LOGICOP_NAND;
|
||||
case VK_LOGIC_OP_SET:
|
||||
return PIPE_LOGICOP_SET;
|
||||
default:
|
||||
unreachable("Invalid logicop");
|
||||
}
|
||||
}
|
||||
|
||||
enum pipe_blend_func
|
||||
vk_blend_op_to_pipe(VkBlendOp in)
|
||||
{
|
||||
switch (in) {
|
||||
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:
|
||||
unreachable("Invalid blend op");
|
||||
}
|
||||
}
|
||||
|
||||
enum pipe_blendfactor
|
||||
vk_blend_factor_to_pipe(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:
|
||||
unreachable("Invalid blend factor");
|
||||
}
|
||||
}
|
25
src/vulkan/runtime/vk_blend.h
Normal file
25
src/vulkan/runtime/vk_blend.h
Normal file
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* Copyright 2023 Valve Corporation
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
#ifndef VK_BLEND_H
|
||||
#define VK_BLEND_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "util/blend.h"
|
||||
#include "vulkan/vulkan_core.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
enum pipe_logicop vk_logic_op_to_pipe(VkLogicOp in);
|
||||
enum pipe_blend_func vk_blend_op_to_pipe(VkBlendOp in);
|
||||
enum pipe_blendfactor vk_blend_factor_to_pipe(VkBlendFactor in);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user