Pass around sw::TaskEvents* instead of vk::Fence*.

src/Device/Renderer.cpp

@@ -185,7 +185,7 @@ namespace sw
 
 		references = -1;
 
-		fence = nullptr;
+		events = nullptr;
 
 		data = (DrawData*)allocate(sizeof(DrawData));
 		data->constants = &constants;
@@ -299,7 +299,7 @@ namespace sw
 		return false;
 	}
 
-	void Renderer::draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex, vk::Fence* fence, bool update)
+	void Renderer::draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex, TaskEvents *events, bool update)
 	{
 		if(count == 0) { return; }
 
@@ -403,12 +403,13 @@ namespace sw
 		data->descriptorSets = context->descriptorSets;
 		data->descriptorDynamicOffsets = context->descriptorDynamicOffsets;
 
-		if(fence)
+		if(events)
 		{
-			fence->start();
+			events->start();
 		}
-		ASSERT(!draw->fence);
-		draw->fence = fence;
+
+		ASSERT(!draw->events);
+		draw->events = events;
 
 		for(int i = 0; i < MAX_VERTEX_INPUTS; i++)
 		{
@@ -889,10 +890,10 @@ namespace sw
 				draw.setupRoutine->unbind();
 				draw.pixelRoutine->unbind();
 
-				if(draw.fence)
+				if(draw.events)
 				{
-					draw.fence->finish();
-					draw.fence = nullptr;
+					draw.events->finish();
+					draw.events = nullptr;
 				}
 
 				sync->unlock();

src/Device/Renderer.hpp

@@ -30,7 +30,6 @@
 namespace vk
 {
 	class DescriptorSet;
-	class Fence;
 	struct Query;
 }
 
@@ -41,6 +40,7 @@ namespace sw
 	class VertexShader;
 	class SwiftConfig;
 	struct Task;
+	class TaskEvents;
 	class Resource;
 	struct Constants;
 
@@ -200,7 +200,7 @@ namespace sw
 
 		bool hasQueryOfType(VkQueryType type) const;
 
-		void draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex, vk::Fence* fence, bool update = true);
+		void draw(const sw::Context* context, VkIndexType indexType, unsigned int count, int baseVertex, TaskEvents *events, bool update = true);
 
 		// Viewport & Clipper
 		void setViewport(const VkViewport &viewport);
@@ -333,7 +333,7 @@ namespace sw
 		vk::ImageView *renderTarget[RENDERTARGETS];
 		vk::ImageView *depthBuffer;
 		vk::ImageView *stencilBuffer;
-		vk::Fence* fence;
+		TaskEvents *events;
 
 		std::list<vk::Query*> *queries;
 

src/Vulkan/VkCommandBuffer.cpp

@@ -601,7 +601,7 @@ struct DrawBase : public CommandBuffer::Command
 			{
 				const uint32_t primitiveCount = indexBuffer.first;
 				context.indexBuffer = indexBuffer.second;
-				executionState.renderer->draw(&context, executionState.indexType, primitiveCount, vertexOffset, executionState.fence);
+				executionState.renderer->draw(&context, executionState.indexType, primitiveCount, vertexOffset, executionState.events);
 			}
 
 			executionState.renderer->advanceInstanceAttributes(context.input);

src/Vulkan/VkCommandBuffer.hpp

@@ -26,12 +26,12 @@ namespace sw
 {
 	class Context;
 	class Renderer;
+	class TaskEvents;
 }
 
 namespace vk
 {
 
-class Fence;
 class Framebuffer;
 class Pipeline;
 class RenderPass;
@@ -133,7 +133,7 @@ public:
 		};
 
 		sw::Renderer* renderer = nullptr;
-		Fence* fence = nullptr;
+		sw::TaskEvents* events = nullptr;
 		RenderPass* renderPass = nullptr;
 		Framebuffer* renderPassFramebuffer = nullptr;
 		std::array<PipelineState, VK_PIPELINE_BIND_POINT_RANGE_SIZE> pipelineState;

src/Vulkan/VkQueue.cpp

@@ -102,11 +102,11 @@ VkResult Queue::submit(uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFen
 	Task task;
 	task.submitCount = submitCount;
 	task.pSubmits = DeepCopySubmitInfo(submitCount, pSubmits);
-	task.fence = (fence != VK_NULL_HANDLE) ? vk::Cast(fence) : nullptr;
+	task.events = (fence != VK_NULL_HANDLE) ? vk::Cast(fence) : nullptr;
 
-	if(task.fence)
+	if(task.events)
 	{
-		task.fence->start();
+		task.events->start();
 	}
 
 	pending.put(task);
@@ -132,7 +132,7 @@ void Queue::submitQueue(const Task& task)
 		{
 			CommandBuffer::ExecutionState executionState;
 			executionState.renderer = renderer.get();
-			executionState.fence = task.fence;
+			executionState.events = task.events;
 			for(uint32_t j = 0; j < submitInfo.commandBufferCount; j++)
 			{
 				vk::Cast(submitInfo.pCommandBuffers[j])->submit(executionState);
@@ -150,12 +150,12 @@ void Queue::submitQueue(const Task& task)
 		toDelete.put(task.pSubmits);
 	}
 
-	if(task.fence)
+	if(task.events)
 	{
 		// TODO: fix renderer signaling so that work submitted separately from (but before) a fence
 		// is guaranteed complete by the time the fence signals.
 		renderer->synchronize();
-		task.fence->finish();
+		task.events->finish();
 	}
 }
 
@@ -187,7 +187,7 @@ VkResult Queue::waitIdle()
 	fence.start();
 
 	Task task;
-	task.fence = &fence;
+	task.events = &fence;
 	pending.put(task);
 
 	fence.wait();

src/Vulkan/VkQueue.hpp

@@ -56,7 +56,7 @@ private:
 	{
 		uint32_t submitCount = 0;
 		VkSubmitInfo* pSubmits = nullptr;
-		Fence* fence = nullptr;
+		sw::TaskEvents* events = nullptr;
 
 		enum Type { KILL_THREAD, SUBMIT_QUEUE };
 		Type type = SUBMIT_QUEUE;