diff --git a/inc/hgl/graph/vulkan/VKDevice.h b/inc/hgl/graph/vulkan/VKDevice.h index 217570b3..56807249 100644 --- a/inc/hgl/graph/vulkan/VKDevice.h +++ b/inc/hgl/graph/vulkan/VKDevice.h @@ -261,7 +261,7 @@ public: //Command Buffer 相关 const VkImageLayout depth_final_layout=VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); Fence * CreateFence(bool); - vulkan::Semaphore * CreateSem(); + vulkan::GPUSemaphore * CreateSemaphore(); public: //FrameBuffer相关 diff --git a/inc/hgl/graph/vulkan/VKSubmitQueue.h b/inc/hgl/graph/vulkan/VKSubmitQueue.h index 358ae128..e26b4915 100644 --- a/inc/hgl/graph/vulkan/VKSubmitQueue.h +++ b/inc/hgl/graph/vulkan/VKSubmitQueue.h @@ -21,10 +21,10 @@ public: SubmitQueue(Device *dev,VkQueue q,const uint32_t fence_count=1); virtual ~SubmitQueue(); - bool QueueWaitIdle(); - bool Wait(const bool wait_wall=true,const uint64_t time_out=HGL_NANO_SEC_PER_SEC); - bool Submit(const VkCommandBuffer &cmd_buf,vulkan::Semaphore *wait_sem,vulkan::Semaphore *complete_sem); - bool Submit(const VkCommandBuffer *cmd_buf,const uint32_t count,vulkan::Semaphore *wait_sem,vulkan::Semaphore *complete_sem); + bool WaitQueue(); + bool WaitFence(const bool wait_all=true,const uint64_t time_out=HGL_NANO_SEC_PER_SEC); + bool Submit(const VkCommandBuffer &cmd_buf,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem); + bool Submit(const VkCommandBuffer *cmd_buf,const uint32_t count,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem); };//class SumbitQueue VK_NAMESPACE_END #endif//HGL_GRAPH_VULKAN_SUBMIT_QUEUE_INCLUDE diff --git a/src/RenderDevice/Vulkan/VKSubmitQueue.cpp b/src/RenderDevice/Vulkan/VKSubmitQueue.cpp index 583efb87..dbdbe029 100644 --- a/src/RenderDevice/Vulkan/VKSubmitQueue.cpp +++ b/src/RenderDevice/Vulkan/VKSubmitQueue.cpp @@ -26,7 +26,7 @@ SubmitQueue::~SubmitQueue() fence_list.Clear(); } -bool SubmitQueue::QueueWaitIdle() +bool SubmitQueue::WaitQueue() { VkResult result=vkQueueWaitIdle(queue); @@ -36,7 +36,7 @@ bool SubmitQueue::QueueWaitIdle() return(true); } -bool SubmitQueue::Wait(const bool wait_all,uint64_t time_out) +bool SubmitQueue::WaitFence(const bool wait_all,uint64_t time_out) { VkResult result; VkFence fence=*fence_list[current_fence]; @@ -50,7 +50,7 @@ bool SubmitQueue::Wait(const bool wait_all,uint64_t time_out) return(true); } -bool SubmitQueue::Submit(const VkCommandBuffer *cmd_buf,const uint32_t cb_count,vulkan::Semaphore *wait_sem,vulkan::Semaphore *complete_sem) +bool SubmitQueue::Submit(const VkCommandBuffer *cmd_buf,const uint32_t cb_count,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem) { VkSemaphore ws; VkSemaphore cs; @@ -93,7 +93,7 @@ bool SubmitQueue::Submit(const VkCommandBuffer *cmd_buf,const uint32_t cb_count, return(result==VK_SUCCESS); } -bool SubmitQueue::Submit(const VkCommandBuffer &cmd_buf,vulkan::Semaphore *wait_sem,vulkan::Semaphore *complete_sem) +bool SubmitQueue::Submit(const VkCommandBuffer &cmd_buf,vulkan::GPUSemaphore *wait_sem,vulkan::GPUSemaphore *complete_sem) { return Submit(&cmd_buf,1,wait_sem,complete_sem); }