Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jmorton06 committed Dec 22, 2024
1 parent d94ba07 commit 41ec782
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Lumos/Source/Lumos/Platform/Vulkan/VKCommandBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions Lumos/Source/Lumos/Platform/Vulkan/VKPipeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -447,7 +447,7 @@ namespace Lumos
LUMOS_PROFILE_FUNCTION();
if(!m_Compute)
{
m_RenderPass->EndRenderPass(commandBuffer);
//m_RenderPass->EndRenderPass(commandBuffer);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Lumos/Source/Lumos/Platform/iOS/iOSWindow.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 41ec782

Please sign in to comment.