renamed Semaphore instead of GPUSemaphore,
renamed Queue instead of GPUQueue
This commit is contained in:
@@ -15,14 +15,14 @@ class RenderTarget
|
||||
{
|
||||
protected:
|
||||
|
||||
GPUQueue *queue;
|
||||
Queue *queue;
|
||||
|
||||
RenderPass *render_pass;
|
||||
Framebuffer *fbo;
|
||||
|
||||
VkExtent2D extent;
|
||||
|
||||
GPUSemaphore *render_complete_semaphore =nullptr;
|
||||
Semaphore *render_complete_semaphore =nullptr;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -34,14 +34,14 @@ protected:
|
||||
|
||||
friend class GPUDevice;
|
||||
|
||||
RenderTarget(GPUQueue *,GPUSemaphore *);
|
||||
RenderTarget(GPUQueue *,GPUSemaphore *,RenderPass *_rp,Framebuffer *_fb,Texture2D **color_texture_list,const uint32_t color_count,Texture2D *depth_texture);
|
||||
RenderTarget(Queue *,Semaphore *);
|
||||
RenderTarget(Queue *,Semaphore *,RenderPass *_rp,Framebuffer *_fb,Texture2D **color_texture_list,const uint32_t color_count,Texture2D *depth_texture);
|
||||
|
||||
public:
|
||||
|
||||
virtual ~RenderTarget();
|
||||
|
||||
GPUQueue * GetQueue () {return queue;}
|
||||
Queue * GetQueue () {return queue;}
|
||||
const VkExtent2D & GetExtent ()const {return extent;}
|
||||
virtual RenderPass * GetRenderPass () {return render_pass;}
|
||||
virtual const VkRenderPass GetVkRenderPass ()const {return render_pass->GetVkRenderPass();}
|
||||
@@ -53,8 +53,8 @@ public:
|
||||
|
||||
public: // command buffer
|
||||
|
||||
GPUSemaphore * GetRenderCompleteSemaphore (){return render_complete_semaphore;}
|
||||
virtual bool Submit (RenderCmdBuffer *,GPUSemaphore *present_complete_semaphore=nullptr);
|
||||
Semaphore * GetRenderCompleteSemaphore (){return render_complete_semaphore;}
|
||||
virtual bool Submit (RenderCmdBuffer *,Semaphore *present_complete_semaphore=nullptr);
|
||||
|
||||
bool WaitQueue(){return queue->WaitQueue();}
|
||||
bool WaitFence(){return queue->WaitFence();}
|
||||
@@ -69,13 +69,13 @@ class SwapchainRenderTarget:public RenderTarget
|
||||
Swapchain *swapchain;
|
||||
PresentInfo present_info;
|
||||
|
||||
GPUSemaphore *present_complete_semaphore=nullptr;
|
||||
Semaphore *present_complete_semaphore=nullptr;
|
||||
|
||||
uint32_t current_frame;
|
||||
|
||||
public:
|
||||
|
||||
SwapchainRenderTarget(VkDevice dev,Swapchain *sc,GPUQueue *q,GPUSemaphore *rcs,GPUSemaphore *pcs,RenderPass *rp);
|
||||
SwapchainRenderTarget(VkDevice dev,Swapchain *sc,Queue *q,Semaphore *rcs,Semaphore *pcs,RenderPass *rp);
|
||||
~SwapchainRenderTarget();
|
||||
|
||||
Framebuffer * GetFramebuffer ()override {return swapchain->render_frame[current_frame];}
|
||||
@@ -90,7 +90,7 @@ public:
|
||||
public:
|
||||
|
||||
const uint32_t GetCurrentFrameIndices ()const {return current_frame;}
|
||||
GPUSemaphore * GetPresentCompleteSemaphore () {return present_complete_semaphore;}
|
||||
Semaphore * GetPresentCompleteSemaphore () {return present_complete_semaphore;}
|
||||
|
||||
public:
|
||||
|
||||
@@ -109,7 +109,7 @@ public:
|
||||
bool PresentBackbuffer();
|
||||
|
||||
bool Submit(VkCommandBuffer);
|
||||
bool Submit(VkCommandBuffer,GPUSemaphore *);
|
||||
bool Submit(VkCommandBuffer,Semaphore *);
|
||||
};//class SwapchainRenderTarget:public RenderTarget
|
||||
VK_NAMESPACE_END
|
||||
#endif//HGL_GRAPH_VULKAN_RENDER_TARGET_INCLUDE
|
||||
|
Reference in New Issue
Block a user