implementing renderpass and vieport

2020-04-12 15:47:19 +02:00
parent 3ba8f2c2a0
commit 576747c369
54 changed files with 6234 additions and 4202 deletions
@@ -4,88 +4,100 @@

 namespace Seele
 {
-	namespace Vulkan
+namespace Vulkan
+{
+DECLARE_REF(RenderPass);
+DECLARE_REF(Framebuffer);
+class CmdBufferBase : public Gfx::RenderCommandBase
+{
+public:
+	CmdBufferBase(PGraphics graphics, VkCommandPool cmdPool);
+	virtual ~CmdBufferBase();
+	inline VkCommandBuffer getHandle()
 	{
-		DECLARE_REF(RenderPass);
-		DECLARE_REF(Framebuffer);
-		class CmdBufferBase : public Gfx::RenderCommandBase
-		{
-		public:
-			CmdBufferBase(PGraphics graphics, VkCommandPool cmdPool);
-			virtual ~CmdBufferBase();
-			inline VkCommandBuffer getHandle()
-			{
-				return handle;
-			}
-			void reset();
-			VkViewport currentViewport;
-			VkRect2D currentScissor;
-		protected:
-			PGraphics graphics;
-			VkCommandBuffer handle;
-			VkCommandPool owner;
-		};
-		DEFINE_REF(CmdBufferBase);
-
-		DECLARE_REF(SecondaryCmdBuffer);
-		class CmdBuffer : public CmdBufferBase
-		{
-		public:
-			CmdBuffer(PGraphics graphics, VkCommandPool cmdPool);
-			virtual ~CmdBuffer();
-			void begin();
-			void end();
-			void beginRenderPass(PRenderPass renderPass, PFramebuffer framebuffer);
-			void endRenderPass();
-			void executeCommands(Array<PSecondaryCmdBuffer> secondaryCommands);
-			void addWaitSemaphore(VkPipelineStageFlags stages, PSemaphore waitSemaphore);
-			enum State
-			{
-				ReadyBegin,
-				InsideBegin,
-				RenderPassActive,
-				Ended,
-				Submitted,
-			};
-
-		private:
-			PRenderPass renderPass;
-			PFramebuffer framebuffer;
-			uint32 subpassIndex;
-			State state;
-			friend class SecondaryCmdBuffer;
-			friend class CommandBufferManager;
-		};
-		DEFINE_REF(CmdBuffer);
-
-		class SecondaryCmdBuffer : public CmdBufferBase
-		{
-		public:
-			SecondaryCmdBuffer(PGraphics graphics, VkCommandPool cmdPool);
-			virtual ~SecondaryCmdBuffer();
-			void begin(PCmdBuffer parent);
-			void end();
-		private:
-		};
-		DEFINE_REF(SecondaryCmdBuffer);
-
-		class CommandBufferManager
-		{
-		public:
-			CommandBufferManager(PGraphics graphics, PQueue queue);
-			virtual ~CommandBufferManager();
-			PCmdBuffer getCommands();
-			PSecondaryCmdBuffer createSecondaryCmdBuffer();
-			void submitCommands(PSemaphore signalSemaphore = nullptr);
-			void waitForCommands(PCmdBuffer cmdBuffer, float timeToWait = 1.0f);
-		private:
-			PGraphics graphics;
-			VkCommandPool commandPool;
-			PQueue queue;
-			uint32 queueFamilyIndex;
-			PCmdBuffer activeCmdBuffer;
-			Array<PCmdBuffer> allocatedBuffers;
-		};
-		DEFINE_REF(CommandBufferManager);
+		return handle;
 	}
-}
+	void reset();
+	VkViewport currentViewport;
+	VkRect2D currentScissor;
+
+protected:
+	PGraphics graphics;
+	VkCommandBuffer handle;
+	VkCommandPool owner;
+};
+DEFINE_REF(CmdBufferBase);
+
+DECLARE_REF(SecondaryCmdBuffer);
+class CmdBuffer : public CmdBufferBase
+{
+public:
+	CmdBuffer(PGraphics graphics, VkCommandPool cmdPool);
+	virtual ~CmdBuffer();
+	void begin();
+	void end();
+	void beginRenderPass(PRenderPass renderPass, PFramebuffer framebuffer);
+	void endRenderPass();
+	void executeCommands(Array<PSecondaryCmdBuffer> secondaryCommands);
+	void addWaitSemaphore(VkPipelineStageFlags stages, PSemaphore waitSemaphore);
+	void refreshFence();
+	enum State
+	{
+		ReadyBegin,
+		InsideBegin,
+		RenderPassActive,
+		Ended,
+		Submitted,
+	};
+
+private:
+	PRenderPass renderPass;
+	PFramebuffer framebuffer;
+	PFence fence;
+	uint32 subpassIndex;
+	State state;
+	Array<PSemaphore> waitSemaphores;
+	Array<VkPipelineStageFlags> waitFlags;
+	friend class SecondaryCmdBuffer;
+	friend class CommandBufferManager;
+	friend class Queue;
+};
+DEFINE_REF(CmdBuffer);
+
+class SecondaryCmdBuffer : public CmdBufferBase
+{
+public:
+	SecondaryCmdBuffer(PGraphics graphics, VkCommandPool cmdPool);
+	virtual ~SecondaryCmdBuffer();
+	void begin(PCmdBuffer parent);
+	void end();
+
+private:
+};
+DEFINE_REF(SecondaryCmdBuffer);
+
+class CommandBufferManager
+{
+public:
+	CommandBufferManager(PGraphics graphics, PQueue queue);
+	virtual ~CommandBufferManager();
+	inline PQueue getQueue() const
+	{
+		return queue;
+	}
+	PCmdBuffer getCommands();
+	PSecondaryCmdBuffer createSecondaryCmdBuffer();
+	void submitCommands(PSemaphore signalSemaphore = nullptr);
+	void waitForCommands(PCmdBuffer cmdBuffer, uint32 timeToWait = 1000000u);
+
+private:
+	PGraphics graphics;
+	VkCommandPool commandPool;
+	PQueue queue;
+	uint32 queueFamilyIndex;
+	PCmdBuffer activeCmdBuffer;
+	Array<PCmdBuffer> allocatedBuffers;
+};
+DEFINE_REF(CommandBufferManager);
+} // namespace Vulkan
+} // namespace Seele