From 99c3d72aa0267f24c133f2a1c0433a9372c3d77a Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Mon, 4 Mar 2019 01:23:13 +0100 Subject: [PATCH] - fix typos --- src/rendering/vulkan/renderer/vk_renderpass.cpp | 2 +- src/rendering/vulkan/renderer/vk_renderstate.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rendering/vulkan/renderer/vk_renderpass.cpp b/src/rendering/vulkan/renderer/vk_renderpass.cpp index e7d38588d4..12b65b1d24 100644 --- a/src/rendering/vulkan/renderer/vk_renderpass.cpp +++ b/src/rendering/vulkan/renderer/vk_renderpass.cpp @@ -298,7 +298,7 @@ void VkRenderPassSetup::CreatePipeline(const VkRenderPassKey &key) builder.setDepthClampEnable(key.DepthClamp); builder.setDepthBias(key.DepthBias, 0.0f, 0.0f, 0.0f); builder.setCull(key.CullMode == Cull_None ? VK_CULL_MODE_NONE : VK_CULL_MODE_FRONT_AND_BACK, key.CullMode == Cull_CW ? VK_FRONT_FACE_CLOCKWISE : VK_FRONT_FACE_COUNTER_CLOCKWISE); - builder.setColorWriteMask((VkColorComponentFlagBits)key.ColorMask); + builder.setColorWriteMask((VkColorComponentFlags)key.ColorMask); builder.setStencil(VK_STENCIL_OP_KEEP, op2vk[key.StencilPassOp], VK_STENCIL_OP_KEEP, VK_COMPARE_OP_EQUAL, 0xffffffff, 0xffffffff, 0); builder.setBlendMode((VkBlendOp)blendequation, (VkBlendFactor)srcblend, (VkBlendFactor)dstblend); diff --git a/src/rendering/vulkan/renderer/vk_renderstate.cpp b/src/rendering/vulkan/renderer/vk_renderstate.cpp index 8862631182..133238679b 100644 --- a/src/rendering/vulkan/renderer/vk_renderstate.cpp +++ b/src/rendering/vulkan/renderer/vk_renderstate.cpp @@ -99,7 +99,7 @@ void VkRenderState::SetStencil(int offs, int op, int flags) { bool cmon = !(flags & SF_ColorMaskOff); SetColorMask(cmon, cmon, cmon, cmon); // don't write to the graphics buffer - mDepthWrite = cmon; + mDepthWrite = !(flags & SF_DepthMaskOff); } mNeedApply = true;