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

dzn: Support alpha blend factor

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20614>
This commit is contained in:
Jesse Natalie
2023-01-04 13:22:18 -08:00
committed by Marge Bot
parent aa3fc8753d
commit 14f0c85874
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/microsoft/vulkan/dzn_pipeline.c
View File

@@ -1403,7 +1403,7 @@ dzn_graphics_pipeline_translate_zsa(struct dzn_device *device,
} }
static D3D12_BLEND static D3D12_BLEND
translate_blend_factor(VkBlendFactor in, bool is_alpha) translate_blend_factor(VkBlendFactor in, bool is_alpha, bool support_alpha_blend_factor)
{ {
switch (in) { switch (in) {
case VK_BLEND_FACTOR_ZERO: return D3D12_BLEND_ZERO; case VK_BLEND_FACTOR_ZERO: return D3D12_BLEND_ZERO;
@@ -1420,13 +1420,14 @@ translate_blend_factor(VkBlendFactor in, bool is_alpha)
case VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: return D3D12_BLEND_INV_SRC_ALPHA; case VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: return D3D12_BLEND_INV_SRC_ALPHA;
case VK_BLEND_FACTOR_DST_ALPHA: return D3D12_BLEND_DEST_ALPHA; case VK_BLEND_FACTOR_DST_ALPHA: return D3D12_BLEND_DEST_ALPHA;
case VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA: return D3D12_BLEND_INV_DEST_ALPHA; case VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA: return D3D12_BLEND_INV_DEST_ALPHA;
/* FIXME: no way to isolate the alpla and color constants */
case VK_BLEND_FACTOR_CONSTANT_COLOR: case VK_BLEND_FACTOR_CONSTANT_COLOR:
return is_alpha && support_alpha_blend_factor ? D3D12_BLEND_ALPHA_FACTOR : D3D12_BLEND_BLEND_FACTOR;
case VK_BLEND_FACTOR_CONSTANT_ALPHA: case VK_BLEND_FACTOR_CONSTANT_ALPHA:
return D3D12_BLEND_BLEND_FACTOR; return support_alpha_blend_factor ? D3D12_BLEND_ALPHA_FACTOR : D3D12_BLEND_BLEND_FACTOR;
case VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR: case VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR:
return is_alpha && support_alpha_blend_factor ? D3D12_BLEND_INV_ALPHA_FACTOR : D3D12_BLEND_INV_BLEND_FACTOR;
case VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA: case VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA:
return D3D12_BLEND_INV_BLEND_FACTOR; return support_alpha_blend_factor ? D3D12_BLEND_INV_ALPHA_FACTOR : D3D12_BLEND_INV_BLEND_FACTOR;
case VK_BLEND_FACTOR_SRC1_COLOR: case VK_BLEND_FACTOR_SRC1_COLOR:
return is_alpha ? D3D12_BLEND_SRC1_ALPHA : D3D12_BLEND_SRC1_COLOR; return is_alpha ? D3D12_BLEND_SRC1_ALPHA : D3D12_BLEND_SRC1_COLOR;
case VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR: case VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR:
@@ -1490,6 +1491,12 @@ dzn_graphics_pipeline_translate_blend(struct dzn_graphics_pipeline *pipeline,
if (!in_blend || !in_ms) if (!in_blend || !in_ms)
return; return;
struct dzn_device *device =
container_of(pipeline->base.base.device, struct dzn_device, vk);
struct dzn_physical_device *pdev =
container_of(device->vk.physical, struct dzn_physical_device, vk);
bool support_alpha_blend_factor = pdev->options13.AlphaBlendFactorSupported;
d3d12_gfx_pipeline_state_stream_new_desc(out, BLEND, D3D12_BLEND_DESC, desc); d3d12_gfx_pipeline_state_stream_new_desc(out, BLEND, D3D12_BLEND_DESC, desc);
D3D12_LOGIC_OP logicop = D3D12_LOGIC_OP logicop =
in_blend->logicOpEnable ? in_blend->logicOpEnable ?
@@ -1514,15 +1521,15 @@ dzn_graphics_pipeline_translate_blend(struct dzn_graphics_pipeline *pipeline,
desc->RenderTarget[i].LogicOp = logicop; desc->RenderTarget[i].LogicOp = logicop;
} else { } else {
desc->RenderTarget[i].SrcBlend = desc->RenderTarget[i].SrcBlend =
translate_blend_factor(in_blend->pAttachments[i].srcColorBlendFactor, false); translate_blend_factor(in_blend->pAttachments[i].srcColorBlendFactor, false, support_alpha_blend_factor);
desc->RenderTarget[i].DestBlend = desc->RenderTarget[i].DestBlend =
translate_blend_factor(in_blend->pAttachments[i].dstColorBlendFactor, false); translate_blend_factor(in_blend->pAttachments[i].dstColorBlendFactor, false, support_alpha_blend_factor);
desc->RenderTarget[i].BlendOp = desc->RenderTarget[i].BlendOp =
translate_blend_op(in_blend->pAttachments[i].colorBlendOp); translate_blend_op(in_blend->pAttachments[i].colorBlendOp);
desc->RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[i].SrcBlendAlpha =
translate_blend_factor(in_blend->pAttachments[i].srcAlphaBlendFactor, true); translate_blend_factor(in_blend->pAttachments[i].srcAlphaBlendFactor, true, support_alpha_blend_factor);
desc->RenderTarget[i].DestBlendAlpha = desc->RenderTarget[i].DestBlendAlpha =
translate_blend_factor(in_blend->pAttachments[i].dstAlphaBlendFactor, true); translate_blend_factor(in_blend->pAttachments[i].dstAlphaBlendFactor, true, support_alpha_blend_factor);
desc->RenderTarget[i].BlendOpAlpha = desc->RenderTarget[i].BlendOpAlpha =
translate_blend_op(in_blend->pAttachments[i].alphaBlendOp); translate_blend_op(in_blend->pAttachments[i].alphaBlendOp);
} }