zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix model chasecam crash

Browse source
This commit is contained in:
Magnus Norddahl 2019-05-12 23:05:31 +02:00
parent 29c6782aa1
commit f2e37d506e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -248,6 +248,11 @@ void VkRenderState::ApplyRenderPass(int dt)
if (changingRenderPass) if (changingRenderPass)
{ {
passKey.ClearTargets = mClearTargets; passKey.ClearTargets = mClearTargets;
// Only clear depth+stencil if the render target actually has that
if (!mRenderTarget.DepthStencil)
passKey.ClearTargets &= ~(CT_Depth | CT_Stencil);
BeginRenderPass(passKey, mCommandBuffer); BeginRenderPass(passKey, mCommandBuffer);
mRenderPassKey = passKey; mRenderPassKey = passKey;
mClearTargets = 0; mClearTargets = 0;

4
src/rendering/vulkan/system/vk_builders.h
View file

@ -766,7 +766,7 @@ inline GraphicsPipelineBuilder::GraphicsPipelineBuilder()
pipelineInfo.pViewportState = &viewportState; pipelineInfo.pViewportState = &viewportState;
pipelineInfo.pRasterizationState = &rasterizer; pipelineInfo.pRasterizationState = &rasterizer;
pipelineInfo.pMultisampleState = &multisampling; pipelineInfo.pMultisampleState = &multisampling;
pipelineInfo.pDepthStencilState = nullptr; pipelineInfo.pDepthStencilState = &depthStencil;
pipelineInfo.pColorBlendState = &colorBlending; pipelineInfo.pColorBlendState = &colorBlending;
pipelineInfo.pDynamicState = &dynamicState; pipelineInfo.pDynamicState = &dynamicState;
pipelineInfo.subpass = 0; pipelineInfo.subpass = 0;
@ -896,8 +896,6 @@ inline void GraphicsPipelineBuilder::setDepthStencilEnable(bool test, bool write
depthStencil.depthTestEnable = test ? VK_TRUE : VK_FALSE; depthStencil.depthTestEnable = test ? VK_TRUE : VK_FALSE;
depthStencil.depthWriteEnable = write ? VK_TRUE : VK_FALSE; depthStencil.depthWriteEnable = write ? VK_TRUE : VK_FALSE;
depthStencil.stencilTestEnable = stencil ? VK_TRUE : VK_FALSE; depthStencil.stencilTestEnable = stencil ? VK_TRUE : VK_FALSE;
pipelineInfo.pDepthStencilState = (test || write || stencil) ? &depthStencil : nullptr;
} }
inline void GraphicsPipelineBuilder::setStencil(VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp, uint32_t compareMask, uint32_t writeMask, uint32_t reference) inline void GraphicsPipelineBuilder::setStencil(VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp, uint32_t compareMask, uint32_t writeMask, uint32_t reference)