From 377129586bf8624f7a4a2e333f18358471bbb0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 2 May 2021 13:57:24 +0200 Subject: [PATCH] Renderer: Rename some TextureLayout entry --- include/Nazara/Renderer/Enums.hpp | 4 ++-- src/Nazara/VulkanRenderer/VkRenderWindow.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Renderer/Enums.hpp b/include/Nazara/Renderer/Enums.hpp index 405e50968..b23263a99 100644 --- a/include/Nazara/Renderer/Enums.hpp +++ b/include/Nazara/Renderer/Enums.hpp @@ -148,8 +148,8 @@ namespace Nz { ColorInput, ColorOutput, - DepthStencilInput, - DepthStencilOutput, + DepthStencilReadOnly, + DepthStencilReadWrite, Present, TransferSource, TransferDestination, diff --git a/src/Nazara/VulkanRenderer/VkRenderWindow.cpp b/src/Nazara/VulkanRenderer/VkRenderWindow.cpp index 4dd7e927d..dc09ac429 100644 --- a/src/Nazara/VulkanRenderer/VkRenderWindow.cpp +++ b/src/Nazara/VulkanRenderer/VkRenderWindow.cpp @@ -427,6 +427,7 @@ namespace Nz { { colorReference }, {}, + {}, std::nullopt } } @@ -475,12 +476,12 @@ namespace Nz AttachmentStoreOp::Discard, AttachmentStoreOp::Discard, TextureLayout::Undefined, - TextureLayout::DepthStencilOutput + TextureLayout::DepthStencilReadWrite }); subpasses.front().depthStencilAttachment = RenderPass::AttachmentReference{ 1, - TextureLayout::DepthStencilOutput + TextureLayout::DepthStencilReadWrite }; }