From 56afcd210b028ee862082921c8fc67483a75a48a Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 3 Mar 2019 23:30:36 +0100 Subject: [PATCH] - fix: gl_PointSize is required in Vulkan when drawing points - fix: add depthstencil attachment when stencil is active while depth is not --- src/rendering/vulkan/renderer/vk_renderpass.cpp | 2 +- wadsrc/static/shaders/glsl/main.vp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rendering/vulkan/renderer/vk_renderpass.cpp b/src/rendering/vulkan/renderer/vk_renderpass.cpp index ad4c0c62cf..242114a8cb 100644 --- a/src/rendering/vulkan/renderer/vk_renderpass.cpp +++ b/src/rendering/vulkan/renderer/vk_renderpass.cpp @@ -312,7 +312,7 @@ void VkRenderPassSetup::CreateFramebuffer(const VkRenderPassKey &key) builder.setRenderPass(RenderPass.get()); builder.setSize(SCREENWIDTH, SCREENHEIGHT); builder.addAttachment(fb->GetRenderPassManager()->SceneColorView.get()); - if (key.DepthTest || key.DepthWrite) + if (key.DepthTest || key.DepthWrite || key.StencilTest) builder.addAttachment(fb->GetRenderPassManager()->SceneDepthStencilView.get()); Framebuffer = builder.create(GetVulkanFrameBuffer()->device); } diff --git a/wadsrc/static/shaders/glsl/main.vp b/wadsrc/static/shaders/glsl/main.vp index e208447b7d..25a2a1f888 100644 --- a/wadsrc/static/shaders/glsl/main.vp +++ b/wadsrc/static/shaders/glsl/main.vp @@ -122,4 +122,6 @@ void main() gl_ClipDistance[3] = 1; gl_ClipDistance[4] = 1; } + + gl_PointSize = 1.0; }