Basic CommandBuffer::waitEvents implementation

src/Vulkan/VkCommandBuffer.cpp

@@ -540,7 +540,11 @@ struct SignalEvent : public CommandBuffer::Command
 
 	void play(CommandBuffer::ExecutionState& executionState) override
 	{
-		Cast(ev)->signal();
+		if(Cast(ev)->signal())
+		{
+			// Was waiting for signal on this event, sync now
+			executionState.renderer->synchronize();
+		}
 	}
 
 private:
@@ -564,6 +568,25 @@ private:
 	VkPipelineStageFlags stageMask; // FIXME(b/117835459) : We currently ignore the flags and reset the event at the last stage
 };
 
+struct WaitEvent : public CommandBuffer::Command
+{
+	WaitEvent(VkEvent ev) : ev(ev)
+	{
+	}
+
+	void play(CommandBuffer::ExecutionState& executionState) override
+	{
+		if(!Cast(ev)->wait())
+		{
+			// Already signaled, sync now
+			executionState.renderer->synchronize();
+		}
+	}
+
+private:
+	VkEvent ev;
+};
+
 struct BindDescriptorSet : public CommandBuffer::Command
 {
 	BindDescriptorSet(VkPipelineBindPoint pipelineBindPoint, uint32_t set, const VkDescriptorSet& descriptorSet)
@@ -1030,7 +1053,15 @@ void CommandBuffer::waitEvents(uint32_t eventCount, const VkEvent* pEvents, VkPi
 	uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier* pBufferMemoryBarriers,
 	uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier* pImageMemoryBarriers)
 {
-	UNIMPLEMENTED("waitEvents");
+	ASSERT(state == RECORDING);
+
+	// TODO(b/117835459): Since we always do a full barrier, all memory barrier related arguments are ignored
+
+	// Note: srcStageMask and dstStageMask are currently ignored
+	for(uint32_t i = 0; i < eventCount; i++)
+	{
+		addCommand<WaitEvent>(pEvents[i]);
+	}
 }
 
 void CommandBuffer::draw(uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance)

src/Vulkan/VkEvent.hpp

@@ -34,9 +34,12 @@ public:
 		return 0;
 	}
 
-	void signal()
+	bool signal()
 	{
 		status = VK_EVENT_SET;
+		bool wasWaiting = waiting;
+		waiting = false;
+		return wasWaiting;
 	}
 
 	void reset()
@@ -49,8 +52,19 @@ public:
 		return status;
 	}
 
+	bool wait()
+	{
+		if(status != VK_EVENT_SET)
+		{
+			waiting = true;
+		}
+
+		return waiting;
+	}
+
 private:
 	VkResult status = VK_EVENT_RESET;
+	bool waiting = false;
 };
 
 static inline Event* Cast(VkEvent object)