From 0ff43f8994ae2f5137dc65bc9a078b1a71e1fc69 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 30 Oct 2020 18:59:58 +0800 Subject: [PATCH] renamed a function, It from BeginRenderpass to BeginRenderPass --- example/Vulkan/DeferredModel.cpp | 2 +- example/common/VulkanAppFramework.h | 6 +++--- inc/hgl/graph/VKCommandBuffer.h | 2 +- src/RenderDevice/VKCommandBufferRender.cpp | 2 +- src/RenderDevice/VKSwapchainRenderTarget.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/example/Vulkan/DeferredModel.cpp b/example/Vulkan/DeferredModel.cpp index e2cd9657..9a21d4bb 100644 --- a/example/Vulkan/DeferredModel.cpp +++ b/example/Vulkan/DeferredModel.cpp @@ -298,7 +298,7 @@ private: if(!gbuffer.cmd->BindFramebuffer(gbuffer.rt->GetRenderPass(),gbuffer.rt->GetFramebuffer())) return(false); - if(!gbuffer.cmd->BeginRenderpass()) + if(!gbuffer.cmd->BeginRenderPass()) return(false); render_list.Render(gbuffer.cmd); diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index e0269ce8..36e779a5 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -104,7 +104,7 @@ public: cili.lunarg.standard_validation = true; cili.khronos.validation = true; - cili.RenderDoc.Capture = true; +// cili.RenderDoc.Capture = true; inst=CreateInstance("VulkanTest",nullptr,&cili); @@ -182,7 +182,7 @@ public: cb->Begin(); cb->BindFramebuffer(rp,fb); cb->SetClearColor(0,clear_color.r,clear_color.g,clear_color.b); - cb->BeginRenderpass(); + cb->BeginRenderPass(); cb->BindPipeline(ri->GetPipeline()); cb->BindDescriptorSets(ri->GetDescriptorSets()); cb->BindVAB(ri); @@ -239,7 +239,7 @@ public: cb->Begin(); cb->BindFramebuffer(sc_render_target->GetRenderPass(),sc_render_target->GetFramebuffer(index)); cb->SetClearColor(0,clear_color.r,clear_color.g,clear_color.b); - cb->BeginRenderpass(); + cb->BeginRenderPass(); rl->Render(cb); cb->EndRenderPass(); cb->End(); diff --git a/inc/hgl/graph/VKCommandBuffer.h b/inc/hgl/graph/VKCommandBuffer.h index 27372c06..a38647cf 100644 --- a/inc/hgl/graph/VKCommandBuffer.h +++ b/inc/hgl/graph/VKCommandBuffer.h @@ -78,7 +78,7 @@ public: bool BindFramebuffer(RenderPass *rp,Framebuffer *fb); - bool BeginRenderpass(); + bool BeginRenderPass(); bool BindPipeline(Pipeline *p) { diff --git a/src/RenderDevice/VKCommandBufferRender.cpp b/src/RenderDevice/VKCommandBufferRender.cpp index d95b6022..de1797ce 100644 --- a/src/RenderDevice/VKCommandBufferRender.cpp +++ b/src/RenderDevice/VKCommandBufferRender.cpp @@ -86,7 +86,7 @@ bool RenderCommand::BindFramebuffer(RenderPass *rp,Framebuffer *fb) return(true); }; -bool RenderCommand::BeginRenderpass() +bool RenderCommand::BeginRenderPass() { vkCmdBeginRenderPass(cmd_buf, &rp_begin, VK_SUBPASS_CONTENTS_INLINE); diff --git a/src/RenderDevice/VKSwapchainRenderTarget.cpp b/src/RenderDevice/VKSwapchainRenderTarget.cpp index 624d0f6a..aa759928 100644 --- a/src/RenderDevice/VKSwapchainRenderTarget.cpp +++ b/src/RenderDevice/VKSwapchainRenderTarget.cpp @@ -89,4 +89,4 @@ bool SwapchainRenderTarget::Submit(VkCommandBuffer cb,GPUSemaphore *pce) { return GPUQueue::Submit(cb,pce,render_complete_semaphore); } -VK_NAMESPACE_END \ No newline at end of file +VK_NAMESPACE_END