Refactor: DirectX and OpenGL render backends now use command buffers internally, so the command execution can be tracked

Author: BearishSun

Source/Foundation/bsfCore/RenderAPI/BsRenderAPI.h

@@ -447,6 +447,12 @@ namespace bs
 		 */
 		virtual void submitCommandBuffer(const SPtr<CommandBuffer>& commandBuffer, UINT32 syncMask = 0xFFFFFFFF) = 0;
 
+		/**
+		 * Returns the currently active main command buffer instance. All commands queues without a user-provided command
+		 * buffer will be queued on this command buffer. The command buffer instance will change after it has been submitted.
+		 */
+		virtual SPtr<CommandBuffer> getMainCommandBuffer() const = 0;
+		
 		/**
 		 * Gets the capabilities of a specific GPU.
 		 *

Source/Plugins/bsfD3D11RenderAPI/BsD3D11CommandBuffer.cpp

@@ -22,28 +22,13 @@ namespace bs { namespace ct
 			return;
 		}
 #endif
-		
-		mCommands.push_back(command);
-	}
-
-	void D3D11CommandBuffer::appendSecondary(const SPtr<D3D11CommandBuffer>& secondaryBuffer)
-	{
-#if BS_DEBUG_MODE
-		if (!secondaryBuffer->mIsSecondary)
-		{
-			BS_LOG(Error, RenderBackend, "Cannot append a command buffer that is not secondary.");
-			return;
-		}
 
-		if (mIsSecondary)
-		{
-			BS_LOG(Error, RenderBackend, "Cannot append a buffer to a secondary command buffer.");
-			return;
-		}
-#endif
-
-		for (auto& entry : secondaryBuffer->mCommands)
-			mCommands.push_back(entry);
+		// We don't support command buffer queuing on DX11, so we just execute the command right away. This means
+		// if caller uses a non-main command buffer the behaviour will likely be incorrect. To properly support
+		// command queuing we'd need to remember state of GpuParams when first bound and handles updates to
+		// buffers after they are bound (and potentially other things).
+		command();
+		mCommandQueued = true;
 	}
 
 	void D3D11CommandBuffer::executeCommands()
@@ -62,9 +47,6 @@ namespace bs { namespace ct
 		}
 #endif
 
-		for (auto& entry : mCommands)
-			entry();
-
 		mFence = bs_shared_ptr_new<D3D11EventQuery>(mDeviceIdx);
 		mFence->begin();
 		mIsSubmitted = true;
@@ -75,12 +57,12 @@ namespace bs { namespace ct
 		if (mIsSubmitted)
 			return isComplete() ? CommandBufferState::Done : CommandBufferState::Executing;
 
-		return mCommands.empty() ? CommandBufferState::Empty : CommandBufferState::Recording;
+		return mCommandQueued ? CommandBufferState::Recording : CommandBufferState::Empty;
 	}
 
 	void D3D11CommandBuffer::reset()
 	{
-		mCommands.clear();
+		mCommandQueued = false;
 		mIsSubmitted = false;
 	}
 

Source/Plugins/bsfD3D11RenderAPI/BsD3D11CommandBuffer.h

@@ -24,9 +24,6 @@ namespace bs { namespace ct
 		/** Registers a new command in the command buffer. */
 		void queueCommand(const std::function<void()> command);
 
-		/** Appends all commands from the secondary buffer into this command buffer. */
-		void appendSecondary(const SPtr<D3D11CommandBuffer>& secondaryBuffer);
-
 		/** Executes all commands in the command buffer. Not supported on secondary buffer. */
 		void executeCommands();
 
@@ -35,7 +32,7 @@ namespace bs { namespace ct
 
 		/** @copydoc CommandBuffer::reset() */
 		void reset() override;
-		
+
 	private:
 		friend class D3D11CommandBufferManager;
 		friend class D3D11RenderAPI;
@@ -45,11 +42,9 @@ namespace bs { namespace ct
 		/** Returns true if the command buffer has finished executing on the GPU. */
 		bool isComplete() const;
 
-		Vector<std::function<void()>> mCommands;
 		SPtr<D3D11EventQuery> mFence;
+		bool mCommandQueued = false;
 		bool mIsSubmitted = false;
-
-		DrawOperationType mActiveDrawOp = DOT_TRIANGLE_LIST;
 	};
 
 	/** @} */