From fc2c8021bae80d5f48f900a1604f075bec7406fd Mon Sep 17 00:00:00 2001
From: "HuYingzhuo(hugo/hyzboy)" <hyzboy@outlook.com>
Date: Fri, 14 Oct 2022 19:27:29 +0800
Subject: [PATCH] renamed Fence instead of GPUFence

---
 example/Vulkan/DeferredRender.cpp  | 2 +-
 inc/hgl/graph/VK.h                 | 2 +-
 inc/hgl/graph/VKDevice.h           | 2 +-
 inc/hgl/graph/VKFence.h            | 8 ++++----
 inc/hgl/graph/VKQueue.h            | 4 ++--
 src/SceneGraph/Vulkan/VKDevice.cpp | 6 +++---
 src/SceneGraph/Vulkan/VKFence.cpp  | 2 +-
 src/SceneGraph/Vulkan/VKQueue.cpp  | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/example/Vulkan/DeferredRender.cpp b/example/Vulkan/DeferredRender.cpp
index 31ce6ef1..8c2ba79c 100644
--- a/example/Vulkan/DeferredRender.cpp
+++ b/example/Vulkan/DeferredRender.cpp
@@ -80,7 +80,7 @@ private:
     SubpassParam            sp_gbuffer;
     SubpassParam            sp_composition;
 
-    Primitive              *ro_plane,
+    Primitive               *ro_plane,
                             *ro_cube,
                             *ro_sphere,
                             *ro_torus,
diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h
index 38e04e87..bab38faf 100644
--- a/inc/hgl/graph/VK.h
+++ b/inc/hgl/graph/VK.h
@@ -67,7 +67,7 @@ class TextureCmdBuffer;
 class RenderPass;
 class DeviceRenderPassManage;
 
-class GPUFence;
+class Fence;
 class GPUSemaphore;
 
 enum class DescriptorSetsType
diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h
index c38aec28..734df5e2 100644
--- a/inc/hgl/graph/VKDevice.h
+++ b/inc/hgl/graph/VKDevice.h
@@ -240,7 +240,7 @@ public:
 
     RenderPass *    AcquireRenderPass(   const RenderbufferInfo *,const uint subpass_count=2);
 
-    GPUFence *      CreateFence(bool);
+    Fence *      CreateFence(bool);
     GPUSemaphore *  CreateGPUSemaphore();
 
     GPUQueue *      CreateQueue(const uint32_t fence_count=1,const bool create_signaled=false);
diff --git a/inc/hgl/graph/VKFence.h b/inc/hgl/graph/VKFence.h
index 088bf7ca..d9d9e923 100644
--- a/inc/hgl/graph/VKFence.h
+++ b/inc/hgl/graph/VKFence.h
@@ -3,7 +3,7 @@
 
 #include<hgl/graph/VK.h>
 VK_NAMESPACE_BEGIN
-class GPUFence
+class Fence
 {
     VkDevice device;
     VkFence fence;
@@ -12,7 +12,7 @@ private:
 
     friend class GPUDevice;
 
-    GPUFence(VkDevice d,VkFence f)
+    Fence(VkDevice d,VkFence f)
     {
         device=d;
         fence=f;
@@ -20,9 +20,9 @@ private:
 
 public:
 
-    ~GPUFence();
+    ~Fence();
 
     operator VkFence(){return fence;}
-};//class GPUFence
+};//class Fence
 VK_NAMESPACE_END
 #endif//HGL_VULKAN_GRAPH_FENCE_INCLUDE
diff --git a/inc/hgl/graph/VKQueue.h b/inc/hgl/graph/VKQueue.h
index 1dc571f3..0459abfc 100644
--- a/inc/hgl/graph/VKQueue.h
+++ b/inc/hgl/graph/VKQueue.h
@@ -12,7 +12,7 @@ protected:
     VkQueue queue;
     
     uint32_t current_fence;
-    GPUFence **fence_list;
+    Fence **fence_list;
     uint32_t fence_count;
 
     SubmitInfo submit_info;
@@ -21,7 +21,7 @@ private:
 
     friend class GPUDevice;
 
-    GPUQueue(VkDevice dev,VkQueue q,GPUFence **,const uint32_t fc);
+    GPUQueue(VkDevice dev,VkQueue q,Fence **,const uint32_t fc);
 
 public:
 
diff --git a/src/SceneGraph/Vulkan/VKDevice.cpp b/src/SceneGraph/Vulkan/VKDevice.cpp
index 997a8449..a2f8030d 100644
--- a/src/SceneGraph/Vulkan/VKDevice.cpp
+++ b/src/SceneGraph/Vulkan/VKDevice.cpp
@@ -116,7 +116,7 @@ TextureCmdBuffer *GPUDevice::CreateTextureCommandBuffer()
  * 创建栅栏
  * @param create_signaled 是否创建初始信号
  */
-GPUFence *GPUDevice::CreateFence(bool create_signaled)
+Fence *GPUDevice::CreateFence(bool create_signaled)
 {
     FenceCreateInfo fenceInfo(create_signaled?VK_FENCE_CREATE_SIGNALED_BIT:0);
 
@@ -125,7 +125,7 @@ GPUFence *GPUDevice::CreateFence(bool create_signaled)
     if(vkCreateFence(attr->device, &fenceInfo, nullptr, &fence)!=VK_SUCCESS)
         return(nullptr);
 
-    return(new GPUFence(attr->device,fence));
+    return(new Fence(attr->device,fence));
 }
 
 GPUSemaphore *GPUDevice::CreateGPUSemaphore()
@@ -144,7 +144,7 @@ GPUQueue *GPUDevice::CreateQueue(const uint32_t fence_count,const bool create_si
 {
     if(fence_count<=0)return(nullptr);
 
-    GPUFence **fence_list=new GPUFence *[fence_count];
+    Fence **fence_list=new Fence *[fence_count];
 
     for(uint32_t i=0;i<fence_count;i++)
         fence_list[i]=CreateFence(create_signaled);
diff --git a/src/SceneGraph/Vulkan/VKFence.cpp b/src/SceneGraph/Vulkan/VKFence.cpp
index 7eb3f66c..26258879 100644
--- a/src/SceneGraph/Vulkan/VKFence.cpp
+++ b/src/SceneGraph/Vulkan/VKFence.cpp
@@ -1,6 +1,6 @@
 #include<hgl/graph/VKFence.h>
 VK_NAMESPACE_BEGIN
-GPUFence::~GPUFence()
+Fence::~Fence()
 {
     vkDestroyFence(device,fence,nullptr);
 }
diff --git a/src/SceneGraph/Vulkan/VKQueue.cpp b/src/SceneGraph/Vulkan/VKQueue.cpp
index 19501573..50b02b1f 100644
--- a/src/SceneGraph/Vulkan/VKQueue.cpp
+++ b/src/SceneGraph/Vulkan/VKQueue.cpp
@@ -7,7 +7,7 @@ namespace
     const VkPipelineStageFlags pipe_stage_flags=VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 }//namespace
 
-GPUQueue::GPUQueue(VkDevice dev,VkQueue q,GPUFence **fl,const uint32_t fc)
+GPUQueue::GPUQueue(VkDevice dev,VkQueue q,Fence **fl,const uint32_t fc)
 {
     device=dev;
     queue=q;