OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fix the multisample and image transition validation errors

Browse source
This commit is contained in:
Magnus Norddahl 2019-03-09 23:17:48 +01:00
commit fed0f0dfab
7 changed files with 82 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rendering/vulkan/renderer/vk_renderstate.cpp
View file

@ -244,6 +244,8 @@ void VkRenderState::ApplyDepthBias()
void VkRenderState::ApplyRenderPass(int dt)
{
auto passManager = GetVulkanFrameBuffer()->GetRenderPassManager();
// Find a render pass that matches our state
VkRenderPassKey passKey;
passKey.DrawType = dt;
@ -258,6 +260,7 @@ void VkRenderState::ApplyRenderPass(int dt)
passKey.StencilPassOp = mStencilOp;
passKey.ColorMask = mColorMask;
passKey.CullMode = mCullMode;
passKey.Samples = passManager->GetSamples();
if (mSpecialEffect > EFF_NONE)
{
passKey.SpecialEffect = mSpecialEffect;
@ -291,7 +294,7 @@ void VkRenderState::ApplyRenderPass(int dt)
if (changingRenderPass)
{
GetVulkanFrameBuffer()->GetRenderPassManager()->BeginRenderPass(passKey, mCommandBuffer);
passManager->BeginRenderPass(passKey, mCommandBuffer);
mRenderPassKey = passKey;
}
}