From 41ec782a4a3d5c9bd600bfc1ae4b57a96f188924 Mon Sep 17 00:00:00 2001 From: jmorton06 Date: Sun, 22 Dec 2024 15:16:32 +0000 Subject: [PATCH] update --- Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp | 6 +++--- Lumos/Source/Lumos/Platform/Vulkan/VKPipeline.cpp | 6 +++--- Lumos/Source/Lumos/Platform/iOS/iOSWindow.mm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp b/Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp index 5456949d..b13477ad 100644 --- a/Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp +++ b/Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp @@ -213,9 +213,9 @@ namespace Lumos m_BoundPipeline->End(this); m_BoundPipeline = nullptr; - /* if(m_BoundRenderPass) - m_BoundRenderPass->EndRenderPass(this); - m_BoundRenderPass = nullptr;*/ + if(m_BoundRenderPass) + m_BoundRenderPass->EndRenderPass(this); + m_BoundRenderPass = nullptr; } void VKCommandBuffer::EndCurrentRenderPass() diff --git a/Lumos/Source/Lumos/Platform/Vulkan/VKPipeline.cpp b/Lumos/Source/Lumos/Platform/Vulkan/VKPipeline.cpp index cb8599cd..162fbe6e 100644 --- a/Lumos/Source/Lumos/Platform/Vulkan/VKPipeline.cpp +++ b/Lumos/Source/Lumos/Platform/Vulkan/VKPipeline.cpp @@ -301,8 +301,8 @@ namespace Lumos framebuffer = m_Framebuffers[0]; } - //((VKCommandBuffer*)commandBuffer)->BeginRenderPass(m_RenderPass, m_Description.clearColour, framebuffer, GetWidth(), GetHeight()); - m_RenderPass->BeginRenderPass(commandBuffer, m_Description.clearColour, framebuffer, Graphics::INLINE, GetWidth(), GetHeight()); + ((VKCommandBuffer*)commandBuffer)->BeginRenderPass(m_RenderPass, m_Description.clearColour, framebuffer, GetWidth(), GetHeight()); + //m_RenderPass->BeginRenderPass(commandBuffer, m_Description.clearColour, framebuffer, Graphics::INLINE, GetWidth(), GetHeight()); } else { @@ -447,7 +447,7 @@ namespace Lumos LUMOS_PROFILE_FUNCTION(); if(!m_Compute) { - m_RenderPass->EndRenderPass(commandBuffer); + //m_RenderPass->EndRenderPass(commandBuffer); } } diff --git a/Lumos/Source/Lumos/Platform/iOS/iOSWindow.mm b/Lumos/Source/Lumos/Platform/iOS/iOSWindow.mm index 3735acbe..3d569c69 100644 --- a/Lumos/Source/Lumos/Platform/iOS/iOSWindow.mm +++ b/Lumos/Source/Lumos/Platform/iOS/iOSWindow.mm @@ -27,7 +27,7 @@ { auto prop = properties; - auto iosOS = (iOSOS*)&iOSOS::Get(); + iOSOS iosOS = iOSOS::Get(); prop.Width = (uint32_t)iosOS->GetWidth(); prop.Height = (uint32_t)iosOS->GetHeight();