nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Turanszki Janos
2020-07-29 20:08:04 +01:00
parent 4cc9697cfa c4789c45d6
commit 7def2db61b
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/RenderPath3D.cpp
+2 -1
View File
@@ -332,7 +332,6 @@ void RenderPath3D::ResizeBuffers()
}
{
RenderPassDesc desc;
desc.attachments.push_back(RenderPassAttachment::RenderTarget(&rtSun[0], RenderPassAttachment::LOADOP_CLEAR));
desc.attachments.push_back(
RenderPassAttachment::DepthStencil(
&depthBuffer,
@@ -343,8 +342,10 @@ void RenderPath3D::ResizeBuffers()
IMAGE_LAYOUT_DEPTHSTENCIL_READONLY
)
);
desc.attachments.push_back(RenderPassAttachment::RenderTarget(&rtSun[0], RenderPassAttachment::LOADOP_CLEAR));
if (getMSAASampleCount() > 1)
{
desc.attachments.back().storeop = RenderPassAttachment::STOREOP_DONTCARE;
desc.attachments.push_back(RenderPassAttachment::Resolve(&rtSun_resolved));
}
WickedEngine/wiGraphicsDevice_Vulkan.cpp
+15 -13
View File
@@ -2009,34 +2009,36 @@ using namespace Vulkan_Internal;
continue;
}
RenderTargetBlendStateDesc desc = pso->desc.bs->desc.RenderTarget[numBlendAttachments++];
RenderTargetBlendStateDesc desc = pso->desc.bs->desc.RenderTarget[numBlendAttachments];
VkPipelineColorBlendAttachmentState& attachment = colorBlendAttachments[numBlendAttachments];
numBlendAttachments++;
colorBlendAttachments[i].blendEnable = desc.BlendEnable ? VK_TRUE : VK_FALSE;
attachment.blendEnable = desc.BlendEnable ? VK_TRUE : VK_FALSE;
colorBlendAttachments[i].colorWriteMask = 0;
attachment.colorWriteMask = 0;
if (desc.RenderTargetWriteMask & COLOR_WRITE_ENABLE_RED)
{
colorBlendAttachments[i].colorWriteMask |= VK_COLOR_COMPONENT_R_BIT;
attachment.colorWriteMask |= VK_COLOR_COMPONENT_R_BIT;
}
if (desc.RenderTargetWriteMask & COLOR_WRITE_ENABLE_GREEN)
{
colorBlendAttachments[i].colorWriteMask |= VK_COLOR_COMPONENT_G_BIT;
attachment.colorWriteMask |= VK_COLOR_COMPONENT_G_BIT;
}
if (desc.RenderTargetWriteMask & COLOR_WRITE_ENABLE_BLUE)
{
colorBlendAttachments[i].colorWriteMask |= VK_COLOR_COMPONENT_B_BIT;
attachment.colorWriteMask |= VK_COLOR_COMPONENT_B_BIT;
}
if (desc.RenderTargetWriteMask & COLOR_WRITE_ENABLE_ALPHA)
{
colorBlendAttachments[i].colorWriteMask |= VK_COLOR_COMPONENT_A_BIT;
attachment.colorWriteMask |= VK_COLOR_COMPONENT_A_BIT;
}
colorBlendAttachments[i].srcColorBlendFactor = _ConvertBlend(desc.SrcBlend);
colorBlendAttachments[i].dstColorBlendFactor = _ConvertBlend(desc.DestBlend);
colorBlendAttachments[i].colorBlendOp = _ConvertBlendOp(desc.BlendOp);
colorBlendAttachments[i].srcAlphaBlendFactor = _ConvertBlend(desc.SrcBlendAlpha);
colorBlendAttachments[i].dstAlphaBlendFactor = _ConvertBlend(desc.DestBlendAlpha);
colorBlendAttachments[i].alphaBlendOp = _ConvertBlendOp(desc.BlendOpAlpha);
attachment.srcColorBlendFactor = _ConvertBlend(desc.SrcBlend);
attachment.dstColorBlendFactor = _ConvertBlend(desc.DestBlend);
attachment.colorBlendOp = _ConvertBlendOp(desc.BlendOp);
attachment.srcAlphaBlendFactor = _ConvertBlend(desc.SrcBlendAlpha);
attachment.dstAlphaBlendFactor = _ConvertBlend(desc.DestBlendAlpha);
attachment.alphaBlendOp = _ConvertBlendOp(desc.BlendOpAlpha);
}
VkPipelineColorBlendStateCreateInfo colorBlending = {};